diff options
Diffstat (limited to 'gentoo/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-16_17_34_08-Fix-fatal-X11-errors-when-both-external-display-and-command-arguments-are-provided-to-QApplication-This-resolves-Bug-1456-e7d0f7d.patch')
2 files changed, 0 insertions, 42 deletions
diff --git a/gentoo b/gentoo new file mode 160000 +Subproject 644110a847c5911c2eb04eb53c93031740561ef diff --git a/gentoo/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-16_17_34_08-Fix-fatal-X11-errors-when-both-external-display-and-command-arguments-are-provided-to-QApplication-This-resolves-Bug-1456-e7d0f7d.patch b/gentoo/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-16_17_34_08-Fix-fatal-X11-errors-when-both-external-display-and-command-arguments-are-provided-to-QApplication-This-resolves-Bug-1456-e7d0f7d.patch deleted file mode 100644 index 40426ef81..000000000 --- a/gentoo/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-16_17_34_08-Fix-fatal-X11-errors-when-both-external-display-and-command-arguments-are-provided-to-QApplication-This-resolves-Bug-1456-e7d0f7d.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp -index 0f9d777..50a2bac 100644 ---- a/src/kernel/qapplication_x11.cpp -+++ b/src/kernel/qapplication_x11.cpp -@@ -1790,18 +1790,26 @@ void qt_init_internal( int *argcptr, char **argv, - } - } - #endif -- // Connect to X server -- -- if( qt_is_gui_used ) { -- if ( ( appDpy = XOpenDisplay(appDpyName) ) == 0 ) { -- qWarning( "%s: cannot connect to X server %s", appName, -- XDisplayName(appDpyName) ); -- qApp = 0; -- exit( 1 ); -- } -+ if ( display ) { -+ // Display connection already opened by another application - -- if ( appSync ) // if "-sync" argument -- XSynchronize( appDpy, TRUE ); -+ appForeignDpy = TRUE; -+ appDpy = display; -+ } -+ else { -+ // Connect to X server -+ -+ if( qt_is_gui_used ) { -+ if ( ( appDpy = XOpenDisplay(appDpyName) ) == 0 ) { -+ qWarning( "%s: cannot connect to X server %s", appName, -+ XDisplayName(appDpyName) ); -+ qApp = 0; -+ exit( 1 ); -+ } -+ -+ if ( appSync ) // if "-sync" argument -+ XSynchronize( appDpy, TRUE ); -+ } - } - } - // Common code, regardless of whether display is foreign. |