From 045b2d9ad8fbb04421db1f7c4707250bf520350a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 11 Apr 2013 18:06:40 -0500 Subject: Properly set WM_CLASS atom even if Display pointer was passed to TQApplication This relates to Bug 1443 (cherry picked from commit e154d27e308f648aabffee9caef82d58d12ce804) --- src/kernel/qapplication.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/kernel/qapplication.cpp') 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 ); -- cgit v1.2.3