diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-15 17:44:28 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-15 17:44:35 (GMT) |
| commit | ad0f3996a9674def59766726db34191844d2af0a (patch) | |
| tree | d029eeb8b988786a8859f98455e5bc3d9651cb80 /src/gui/widgets/qsplashscreen.cpp | |
| parent | c0cd8db0498daaa8151d1f80143b6849016bdc7c (diff) | |
| parent | 5e47ee6a97f54f1cdac577f76cd338b40e624f32 (diff) | |
| download | Qt-ad0f3996a9674def59766726db34191844d2af0a.zip Qt-ad0f3996a9674def59766726db34191844d2af0a.tar.gz Qt-ad0f3996a9674def59766726db34191844d2af0a.tar.bz2 | |
Merge earth-team into master
Diffstat (limited to 'src/gui/widgets/qsplashscreen.cpp')
| -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(); |