remove QEXPECT_FAILS from tst_qwidget
Task-number: QTBUG-26420 Change-Id: Ic4cb725cda418bfb427e7d834c0e07c2543d408d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
parent
1c2d95d1b7
commit
5b0273fc7a
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user