summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2012-07-09 09:55:10 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-09 10:50:34 +0200
commit5b0273fc7a27785b6079a3b39681c3db22926742 (patch)
tree00847f726e8b19f7c124d9b9cd52ab9969c35eca
parent1c2d95d1b7538fa91e2c07c163833da8e415ed91 (diff)
remove QEXPECT_FAILS from tst_qwidget
Task-number: QTBUG-26420 Change-Id: Ic4cb725cda418bfb427e7d834c0e07c2543d408d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
-rw-r--r--tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 4ea6d4970a..fb2b66fe62 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -1783,21 +1783,12 @@ void tst_QWidget::windowState()
widget1.setWindowState(widget1.windowState() ^ Qt::WindowMinimized);
QTest::qWait(100);
-#ifdef Q_OS_WIN
- QEXPECT_FAIL("", "QTBUG-26420", Continue);
-#endif
VERIFY_STATE((Qt::WindowFullScreen|Qt::WindowMinimized));
QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowMinimized);
widget1.setWindowState(widget1.windowState() ^ Qt::WindowMinimized);
QTest::qWait(100);
-#ifdef Q_OS_WIN
- QEXPECT_FAIL("", "QTBUG-26420", Continue);
-#endif
VERIFY_STATE(Qt::WindowFullScreen);
-#ifdef Q_OS_WIN
- QEXPECT_FAIL("", "QTBUG-26420", Continue);
-#endif
QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowFullScreen);
widget1.setWindowState(Qt::WindowNoState);
@@ -1816,10 +1807,6 @@ void tst_QWidget::windowState()
VERIFY_STATE((Qt::WindowFullScreen|Qt::WindowMaximized));
QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowFullScreen);
-#ifdef Q_OS_WIN
- QSKIP("QTBUG-26420");
-#endif
-
widget1.setWindowState(widget1.windowState() ^ Qt::WindowMinimized);
QTest::qWait(100);
VERIFY_STATE((Qt::WindowFullScreen|Qt::WindowMaximized|Qt::WindowMinimized));
@@ -2409,7 +2396,6 @@ void tst_QWidget::normalGeometry()
QTRY_COMPARE(parent.geometry(), geom);
QTRY_COMPARE(parent.normalGeometry(), geom);
- QSKIP("QTBUG-26420");
parent.showNormal();
parent.setWindowState(Qt:: WindowFullScreen | Qt::WindowMaximized);
parent.setWindowState(Qt::WindowMinimized | Qt:: WindowFullScreen | Qt::WindowMaximized);