diff options
| author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2012-03-21 11:07:35 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-20 10:29:14 +0200 |
| commit | 128b7c56b732cabdbd600445aac5162c775e58d4 (patch) | |
| tree | c6699b97cdd9522bb24cf8588810c12d03dd60bc /tests/auto/widgets/widgets | |
| parent | 872f567d530daad7d897767fd56e061d8f4e5f36 (diff) | |
Implement QCocoaWindow::setWindowState.
Add window state change notification logic. Send
and expose event in addition to window state change
on window restore since the QWidget logic expects
this.
Modify QCocoaWindow::setVisible to sync up window
state that may have been set on the hidden window.
Refactor NSWindow event observing to use one observer
function for all notifications.
Add window state testing to tests/manual/windowflags
Add delay after showFullScreen in tst_qstatusbar to
wait for the Lion fullscreen transition.
Change-Id: I57c523cedd0644d4181b40d72046fad4fdb09a9c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/widgets/widgets')
| -rw-r--r-- | tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp index 081e817727..d23f69ac6c 100644 --- a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp +++ b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp @@ -199,7 +199,9 @@ void tst_QStatusBar::setSizeGripEnabled() QVERIFY(!sizeGrip); qApp->processEvents(); +#ifndef Q_OS_MAC // Work around Lion fullscreen issues on CI system - QTQAINFRA-506 mainWindow.showFullScreen(); +#endif #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&mainWindow); #endif @@ -220,7 +222,9 @@ void tst_QStatusBar::setSizeGripEnabled() QVERIFY(!sizeGrip->isVisible()); qApp->processEvents(); +#ifndef Q_OS_MAC mainWindow.showNormal(); +#endif qApp->processEvents(); QTRY_VERIFY(sizeGrip->isVisible()); } |