diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-11 18:06:40 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-04-13 13:31:15 +0200 |
| commit | 045b2d9ad8fbb04421db1f7c4707250bf520350a (patch) | |
| tree | 285b47f3027d6a57e38bb6458dfe28c12301bc4b /src/kernel/qapplication_x11.cpp | |
| parent | a78eb9c8b7173fb26aeb7b79d7b733a8c17e8311 (diff) | |
| download | qt3-045b2d9ad8fbb04421db1f7c4707250bf520350a.tar.gz qt3-045b2d9ad8fbb04421db1f7c4707250bf520350a.zip | |
Properly set WM_CLASS atom even if Display pointer was passed to TQApplication
This relates to Bug 1443
(cherry picked from commit e154d27e308f648aabffee9caef82d58d12ce804)
Diffstat (limited to 'src/kernel/qapplication_x11.cpp')
| -rw-r--r-- | src/kernel/qapplication_x11.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index 4a03d95..0f9d777 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -1639,7 +1639,7 @@ void qt_init_internal( int *argcptr, char **argv, } #endif - if ( display ) { + if ( display && ((!argcptr) || (!argv)) ) { // Qt part of other application appForeignDpy = TRUE; @@ -2439,6 +2439,11 @@ void qt_init( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap ) qt_init_internal( 0, 0, display, visual, colormap ); } +void qt_init( int *argcptr, char **argv, Display *display, Qt::HANDLE visual, Qt::HANDLE colormap ) +{ + qt_init_internal( argcptr, argv, display, visual, colormap ); +} + /***************************************************************************** qt_cleanup() - cleans up when the application is finished |