diff options
| -rw-r--r-- | tests/auto/gui.pro | 3 | ||||
| -rw-r--r-- | tests/auto/qwindowsurface/tst_qwindowsurface.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index 9d7adc60dc..180cf047c6 100644 --- a/tests/auto/gui.pro +++ b/tests/auto/gui.pro @@ -135,6 +135,9 @@ SUBDIRS=\ qwswindowsystem \ qx11info \ +# This test cannot be run on Mac OS +mac*:SUBDIRS -= qwindowsurface + # This test takes too long to run on IRIX, so skip it on that platform irix-*:SUBDIRS -= qitemview diff --git a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp index 5fdd273008..fb273a0166 100644 --- a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp +++ b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp @@ -45,7 +45,7 @@ #include <QPalette> #include <QWindowsStyle> -#if !defined(Q_WS_MAC) && QT_VERSION < 0x050000 // Fixme Qt 5 +#if QT_VERSION < 0x050000 // Fixme Qt 5 #include <private/qwindowsurface_p.h> #include <QDesktopWidget> @@ -283,8 +283,9 @@ void tst_QWindowSurface::grabWidget() QTEST_MAIN(tst_QWindowSurface) -#else // Q_WS_MAC +#else +// Temporarily skip the entire test until it is fixed for Qt5 QTEST_NOOP_MAIN #endif |