summaryrefslogtreecommitdiffstats
path: root/tests/auto/qstatusbar/tst_qstatusbar.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-11-27 15:57:23 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-11-27 15:58:43 (GMT)
commitf93097671f512f38790ba2d56bd5b1e037810266 (patch)
treea4dd9aa09a8ca658bb9a46da26472ee0c5f317da /tests/auto/qstatusbar/tst_qstatusbar.cpp
parent19d0a365dd99dc1a108e58949f7d0f49bac72623 (diff)
parent583b1529894aca5e9ffa353f0547dfb4b8b0ab21 (diff)
downloadQt-f93097671f512f38790ba2d56bd5b1e037810266.zip
Qt-f93097671f512f38790ba2d56bd5b1e037810266.tar.gz
Qt-f93097671f512f38790ba2d56bd5b1e037810266.tar.bz2
Merge commit oslo-staging-2/4.6 into upstream/4.6
Diffstat (limited to 'tests/auto/qstatusbar/tst_qstatusbar.cpp')
-rw-r--r--tests/auto/qstatusbar/tst_qstatusbar.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/qstatusbar/tst_qstatusbar.cpp b/tests/auto/qstatusbar/tst_qstatusbar.cpp
index 92d9185..03d8ca8 100644
--- a/tests/auto/qstatusbar/tst_qstatusbar.cpp
+++ b/tests/auto/qstatusbar/tst_qstatusbar.cpp
@@ -266,10 +266,15 @@ void tst_QStatusBar::QTBUG4334_hiddenOnMaximizedWindow()
main.setStatusBar(&statusbar);
main.showMaximized();
QTest::qWaitForWindowShown(&main);
+#ifndef Q_WS_MAC
QVERIFY(!statusbar.findChild<QSizeGrip*>()->isVisible());
+#endif
main.showNormal();
QTest::qWaitForWindowShown(&main);
QVERIFY(statusbar.findChild<QSizeGrip*>()->isVisible());
+ main.showFullScreen();
+ QTest::qWaitForWindowShown(&main);
+ QVERIFY(!statusbar.findChild<QSizeGrip*>()->isVisible());
}
QTEST_MAIN(tst_QStatusBar)