From f9ae26acf20dc90f578b191fe906ab680b4fc97b Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Tue, 21 Jun 2011 09:36:13 +0200
Subject: Fixed compile of autotests for Mac & QPA
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Several autotests were assuming that Q_OS_MAC == Mac cocoa port, which
caused compile failures when QPA is used.

Change-Id: I4480ed815c15b6d9ce83edf0057b7293f2e3ad7e
Reviewed-on: http://codereview.qt.nokia.com/533
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
---
 tests/auto/other.pro                   | 2 +-
 tests/auto/qfontdialog/qfontdialog.pro | 2 +-
 tests/auto/qlayout/tst_qlayout.cpp     | 4 ++--
 tests/auto/qmacstyle/tst_qmacstyle.cpp | 2 +-
 tests/auto/qwidget/qwidget.pro         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index b50e1697b3..c4ddc83cdf 100644
--- a/tests/auto/other.pro
+++ b/tests/auto/other.pro
@@ -38,7 +38,7 @@ SUBDIRS=\
 contains(QT_CONFIG, accessibility):SUBDIRS += qaccessibility
 
 contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter
-mac: {
+mac:!qpa {
     SUBDIRS += macgui \
                macnativeevents \
                macplist \
diff --git a/tests/auto/qfontdialog/qfontdialog.pro b/tests/auto/qfontdialog/qfontdialog.pro
index 637e896518..d4edaaca21 100644
--- a/tests/auto/qfontdialog/qfontdialog.pro
+++ b/tests/auto/qfontdialog/qfontdialog.pro
@@ -4,7 +4,7 @@ QT += core-private gui-private
 
 SOURCES  += tst_qfontdialog.cpp
 
-mac {
+mac:!qpa {
     OBJECTIVE_SOURCES += tst_qfontdialog_mac_helpers.mm
     LIBS += -framework Cocoa
 }
diff --git a/tests/auto/qlayout/tst_qlayout.cpp b/tests/auto/qlayout/tst_qlayout.cpp
index eb651f485b..81b92cadec 100644
--- a/tests/auto/qlayout/tst_qlayout.cpp
+++ b/tests/auto/qlayout/tst_qlayout.cpp
@@ -56,7 +56,7 @@
 #include <QRadioButton>
 #include <private/qlayoutengine_p.h>
 
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
 # include <QtGui/QMacStyle>
 #endif
 
@@ -280,7 +280,7 @@ public:
 
 void tst_QLayout::layoutItemRect()
 {
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
     if (qobject_cast<QMacStyle*>(QApplication::style())) {
         QWidget *window = new QWidget;
         QRadioButton *radio = new QRadioButton(window);
diff --git a/tests/auto/qmacstyle/tst_qmacstyle.cpp b/tests/auto/qmacstyle/tst_qmacstyle.cpp
index f9fc81ed58..6e03afd575 100644
--- a/tests/auto/qmacstyle/tst_qmacstyle.cpp
+++ b/tests/auto/qmacstyle/tst_qmacstyle.cpp
@@ -45,7 +45,7 @@
 
 #include <qmacstyle_mac.h>
 
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
 
 const int N = 1;
 
diff --git a/tests/auto/qwidget/qwidget.pro b/tests/auto/qwidget/qwidget.pro
index dfb7358127..50aa08deb4 100644
--- a/tests/auto/qwidget/qwidget.pro
+++ b/tests/auto/qwidget/qwidget.pro
@@ -9,7 +9,7 @@ aix-g++*:QMAKE_CXXFLAGS+=-fpermissive
 
 CONFIG += x11inc
 
-mac {
+mac:!qpa {
     LIBS += -framework Security -framework AppKit -framework Carbon
     OBJECTIVE_SOURCES += tst_qwidget_mac_helpers.mm
 }
-- 
cgit v1.2.3