diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-04-20 02:03:55 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-24 12:49:56 +0200 |
| commit | 4aacc47f66da8616925b9f04cdfe903d3f3404e5 (patch) | |
| tree | a1df35f22d61a2ae7b59fe634739dd1a32eb5e61 /tests/auto/widgets | |
| parent | 39e6d75511f5871a43449a5c435535d3c0b853de (diff) | |
Remove insignification of QMdiArea test on Windows.
This test had two stable failures, caused by including code not meant
for Windows.
Task-number: QTBUG-25298
Change-Id: I43d9d62ecf5a3c6eec240fafbc43a625c00f45fa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/widgets')
| -rw-r--r-- | tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro b/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro index e2a8d2f9c9..d2156a1718 100644 --- a/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro +++ b/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro @@ -12,4 +12,4 @@ mac { LIBS += -framework Security } -!mac:CONFIG+=insignificant_test # QTBUG-25298 +!mac:!win32:CONFIG+=insignificant_test # QTBUG-25298 diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index 69c14f7774..7aa9bb2ddf 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -1032,7 +1032,7 @@ void tst_QMdiArea::activeSubWindow() qApp->setActiveWindow(&mainWindow); QCOMPARE(mdiArea->activeSubWindow(), subWindow); -#if !defined(Q_OS_MAC) && !defined(Q_WS_WIN) +#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN) qApp->setActiveWindow(0); QVERIFY(!mdiArea->activeSubWindow()); #endif @@ -1117,7 +1117,7 @@ void tst_QMdiArea::currentSubWindow() QVERIFY(mdiArea.activeSubWindow()); QVERIFY(mdiArea.currentSubWindow()); -#if !defined(Q_OS_MAC) && !defined(Q_WS_WIN) +#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN) qApp->setActiveWindow(0); QVERIFY(!mdiArea.activeSubWindow()); QVERIFY(mdiArea.currentSubWindow()); |