From 0a663b92ff4934b0d4f38b97edd22fe81ef521e4 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 4 Oct 2011 16:58:55 +1000
Subject: [PATCH] Don't build qwindowsurface autotest on Mac OS.

The test was a no-op on Mac OS. It's better to avoid building or running
it on Mac OS, rather than spending time compiling and running a test
that does nothing on that platform.

Change-Id: I4aa579036788e404f8a6a8f1a80acd32338fb3cd
Reviewed-on: http://codereview.qt-project.org/5958
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 tests/auto/gui.pro                               | 3 +++
 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