diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-03-21 08:46:34 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-03-21 08:46:34 (GMT) |
| commit | a3c66f6898c560820ff5768159e4af1323219161 (patch) | |
| tree | 143fa35cd328a2d9fb4690d703050d01eb407bbb /src/gui/widgets | |
| parent | 51c2b10379b0bbed5804f0f8e2eca82e5bb4d0bf (diff) | |
| parent | 86ceda033eda6bd615134f71b9850081a0c808c9 (diff) | |
| download | Qt-a3c66f6898c560820ff5768159e4af1323219161.zip Qt-a3c66f6898c560820ff5768159e4af1323219161.tar.gz Qt-a3c66f6898c560820ff5768159e4af1323219161.tar.bz2 | |
Merge remote branch 'qt/master' into staging-master
Conflicts:
src/gui/image/qpnghandler.cpp
src/opengl/qwindowsurface_gl.cpp
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qsplashscreen.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qsplashscreen.cpp b/src/gui/widgets/qsplashscreen.cpp index 75280cb..9c486bf 100644 --- a/src/gui/widgets/qsplashscreen.cpp +++ b/src/gui/widgets/qsplashscreen.cpp @@ -223,8 +223,8 @@ void QSplashScreen::finish(QWidget *mainWin) { if (mainWin) { #if defined(Q_WS_X11) - extern void qt_x11_wait_for_window_manager(QWidget *mainWin); - qt_x11_wait_for_window_manager(mainWin); + extern void qt_x11_wait_for_window_manager(QWidget *mainWin, bool); + qt_x11_wait_for_window_manager(mainWin, false); #endif } close(); |