Fixed compile of autotests for Mac & QPA

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>

diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index b50e169..c4ddc83 100644 (file)
--- 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 637e896..d4edaac 100644 (file)
--- 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 eb651f4..81b92ca 100644 (file)
--- 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 f9fc81e..6e03afd 100644 (file)
--- 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 dfb7358..50aa08d 100644 (file)
--- 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
 }