whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable the qmdiarea test on X11 

Task-number: QTBUG-25298
Change-Id: Iec7591e9e84951a1aea47590aaedaac877cd111e
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
bb10
Paul Olav Tvete 2014-09-18 16:36:51 +02:00
parent 1a801e0eef
commit c171a21ae4
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro
View File

@ -11,5 +11,3 @@ qtHaveModule(opengl): QT += opengl
mac {
LIBS += -framework Security
}
!mac:!win32:CONFIG+=insignificant_test # QTBUG-25298

13
tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
View File

@ -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()