diff options
| author | Timothy Pearson <[email protected]> | 2013-04-11 18:06:40 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-04-11 18:06:40 -0500 |
| commit | e154d27e308f648aabffee9caef82d58d12ce804 (patch) | |
| tree | f7c685e921ac2835e06ce4c0a4a0e1098305449f /src/kernel/qapplication_x11.cpp | |
| parent | d09860faff8dac4c63db6e22eeb556a15c2ffaeb (diff) | |
| download | qt3-e154d27e308f648aabffee9caef82d58d12ce804.tar.gz qt3-e154d27e308f648aabffee9caef82d58d12ce804.zip | |
Properly set WM_CLASS atom even if Display pointer was passed to TQApplication
This relates to Bug 1443
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 2875228..121d633 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -1652,7 +1652,7 @@ void qt_init_internal( int *argcptr, char **argv, } #endif - if ( display ) { + if ( display && ((!argcptr) || (!argv)) ) { // Qt part of other application appForeignDpy = TRUE; @@ -2465,6 +2465,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 |