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.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.cpp')
| -rw-r--r-- | src/kernel/qapplication.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp index 7296f4c..0ec4904 100644 --- a/src/kernel/qapplication.cpp +++ b/src/kernel/qapplication.cpp @@ -320,6 +320,7 @@ void qt_init( int *, char **, QApplication::Type ); void qt_cleanup(); #if defined(Q_WS_X11) void qt_init( Display* dpy, Qt::HANDLE, Qt::HANDLE ); +void qt_init( int *, char **, Display* dpy, Qt::HANDLE, Qt::HANDLE ); #endif Q_EXPORT bool qt_tryModalHelper( QWidget *widget, QWidget **rettop ); @@ -908,7 +909,7 @@ QApplication::QApplication(Display *dpy, int argc, char **argv, qt_init( &argc, argv, GuiClient ); } else { - qt_init(dpy, visual, colormap); + qt_init( &argc, argv, dpy, visual, colormap ); } process_cmdline( &argc, argv ); |