diff options
Diffstat (limited to 'tests/auto/gui')
| -rw-r--r-- | tests/auto/gui/kernel/qwindow/qwindow.pro | 3 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/gui/kernel/qwindow/qwindow.pro b/tests/auto/gui/kernel/qwindow/qwindow.pro index 363f7dd92e..e419a10440 100644 --- a/tests/auto/gui/kernel/qwindow/qwindow.pro +++ b/tests/auto/gui/kernel/qwindow/qwindow.pro @@ -4,6 +4,3 @@ TARGET = tst_qwindow QT += core-private gui-private testlib SOURCES += tst_qwindow.cpp - -mac: CONFIG += insignificant_test # QTBUG-23059 - diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index 55a9a39882..73f70fbe3c 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -162,6 +162,12 @@ void tst_QWindow::eventOrderOnShow() void tst_QWindow::positioning() { +#ifdef Q_OS_MAC + // the fullscreen animation delay on OS X Lion also causes failures in + // the isActive() test below, so it's best to just skip it for now + QSKIP("Multiple failures in this test on Mac OS X, see QTBUG-23059"); +#endif + // Some platforms enforce minimum widths for windows, which can cause extra resize // events, so set the width to suitably large value to avoid those. QRect geometry(80, 80, 300, 40); @@ -233,9 +239,6 @@ void tst_QWindow::isExposed() window.hide(); QCoreApplication::processEvents(); -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "This test fails on Mac OS X, see QTBUG-23059", Abort); -#endif QTRY_VERIFY(window.received(QEvent::Expose) > 1); QTRY_VERIFY(!window.isExposed()); } |