diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-02-05 10:06:51 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-19 08:53:55 +0100 |
| commit | 73d32873cf307a60bbe83f2c9e973236bccb4162 (patch) | |
| tree | 3477ae2951d9f5c34282f447848f05a8ea72a93b /tests | |
| parent | 4b42c91821b913aec32ab82d2d5e29ffa2f2a8ad (diff) | |
Cocoa: Add QMdiSubWindow size grip back.
Change all Q_WS_MAC -> Q_OS_MAC in qmdisubwindow.cpp
Remove QEXPECT_FAIL from tst_qmdisubwindow.cpp.
Task-number: QTBUG-29434, QTBUG-25297
Change-Id: I299b87ab994e2d5ba93d5bbae48de0df1ac1c9d6
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp index 6198aa8668..2163426cac 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp +++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp @@ -600,9 +600,6 @@ 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); @@ -711,9 +708,6 @@ void tst_QMdiSubWindow::setOpaqueResizeAndMove() mouseReceiver = qFindChild<QSizeGrip *>(window); else mouseReceiver = window; -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "QTBUG-25297", Abort); -#endif QVERIFY(mouseReceiver); // ----------------------------- resize ----------------------------- @@ -1451,9 +1445,6 @@ 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). @@ -1713,9 +1704,6 @@ 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); |