diff options
Diffstat (limited to 'tests/auto/widgets/widgets/qmdisubwindow')
-rw-r--r-- | tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro | 3 | ||||
-rw-r--r-- | tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro b/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro index be929d1429..4299f7711e 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro +++ b/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro @@ -4,6 +4,3 @@ QT += widgets testlib INCLUDEPATH += . SOURCES += tst_qmdisubwindow.cpp DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII - - -mac*:CONFIG+=insignificant_test diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp index bc5100f118..79afd14481 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp +++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp @@ -610,6 +610,9 @@ void tst_QMdiSubWindow::showShaded() else #endif mouseReceiver = window; +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-25297", Abort); +#endif QVERIFY(mouseReceiver); sendMouseMove(mouseReceiver, mousePosition, Qt::NoButton); sendMousePress(mouseReceiver, mousePosition); @@ -724,6 +727,9 @@ void tst_QMdiSubWindow::setOpaqueResizeAndMove() mouseReceiver = qFindChild<QSizeGrip *>(window); else mouseReceiver = window; +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-25297", Abort); +#endif QVERIFY(mouseReceiver); // ----------------------------- resize ----------------------------- @@ -1432,6 +1438,9 @@ void tst_QMdiSubWindow::defaultSizeGrip() // QSizeGrip on windows with decoration. QMdiSubWindow *windowWithDecoration = mdiArea.addSubWindow(new QWidget); windowWithDecoration->show(); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-25297", Abort); +#endif QVERIFY(qFindChild<QSizeGrip *>(windowWithDecoration)); // ...but not on windows without decoration (Qt::FramelessWindowHint). @@ -1699,6 +1708,9 @@ void tst_QMdiSubWindow::fixedMinMaxSize() // to minimize the window. subWindow->showMinimized(); QVERIFY(subWindow->isMinimized()); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-25297", Abort); +#endif QCOMPARE(subWindow->size(), minimizedSize); QCOMPARE(subWindow->minimumSize(), minimizedSize); |