Automated update from Qt3

11 years ago · d359f91916
parent 7e8d6ff0bc
commit d359f91916
1 changed files with 19 additions and 11 deletions
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@ -1803,6 +1803,13 @@ void tqt_init_internal( int *argcptr, char **argv,
 	    }
 	}
 #endif
+	if ( display ) {
+		// Display connection already opened by another application
+
+		appForeignDpy = TRUE;
+		appDpy  = display;
+	}
+	else {
 		// Connect to X server
 	
 		if( tqt_is_gui_used ) {
@ -1817,6 +1824,7 @@ void tqt_init_internal( int *argcptr, char **argv,
 			XSynchronize( appDpy, TRUE );
 		}
 	}
+    }
    // Common code, regardless of whether display is foreign.

    // Get X parameters