diff options
-rw-r--r-- | tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro | 2 | ||||
-rw-r--r-- | tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro b/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro index cfd0dd5463..119204c10e 100644 --- a/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro +++ b/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro @@ -11,5 +11,3 @@ qtHaveModule(opengl): QT += opengl mac { LIBS += -framework Security } - -!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 0e5150d6d1..f457955657 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -518,6 +518,8 @@ void tst_QMdiArea::subWindowActivated2() #ifdef Q_OS_MAC QSKIP("QTBUG-25298: This test is unstable on Mac."); #endif + if (qApp->platformName().toLower() == QStringLiteral("xcb")) + QSKIP("QTBUG-25298: Unstable on some X11 window managers"); QTRY_COMPARE(spy.count(), 1); QVERIFY(!mdiArea.activeSubWindow()); QCOMPARE(mdiArea.currentSubWindow(), activeSubWindow); @@ -1011,11 +1013,6 @@ void tst_QMdiArea::activeSubWindow() qApp->setActiveWindow(&mainWindow); QCOMPARE(mdiArea->activeSubWindow(), subWindow); -#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN) && !defined(Q_OS_QNX) - qApp->setActiveWindow(0); - QVERIFY(!mdiArea->activeSubWindow()); -#endif - //task 202657 dockWidgetLineEdit->setFocus(); qApp->setActiveWindow(&mainWindow); @@ -1091,12 +1088,6 @@ void tst_QMdiArea::currentSubWindow() qApp->sendEvent(active, &windowActivate); QVERIFY(mdiArea.activeSubWindow()); QVERIFY(mdiArea.currentSubWindow()); - -#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN) && !defined(Q_OS_QNX) - qApp->setActiveWindow(0); - QVERIFY(!mdiArea.activeSubWindow()); - QVERIFY(mdiArea.currentSubWindow()); -#endif } void tst_QMdiArea::addAndRemoveWindows() |