Fix fatal X11 errors when both external display and command arguments are provided to QApplication

This resolves Bug 1456
pull/2/head
Timothy Pearson 12 years ago
parent e154d27e30
commit 7abfc2a181

@ -1803,6 +1803,13 @@ void qt_init_internal( int *argcptr, char **argv,
} }
} }
#endif #endif
if ( display ) {
// Display connection already opened by another application
appForeignDpy = TRUE;
appDpy = display;
}
else {
// Connect to X server // Connect to X server
if( qt_is_gui_used ) { if( qt_is_gui_used ) {
@ -1817,6 +1824,7 @@ void qt_init_internal( int *argcptr, char **argv,
XSynchronize( appDpy, TRUE ); XSynchronize( appDpy, TRUE );
} }
} }
}
// Common code, regardless of whether display is foreign. // Common code, regardless of whether display is foreign.
// Get X parameters // Get X parameters

Loading…
Cancel
Save