Replace Q_WS_MAC with Q_OS_MAC in tests/auto/gui

Change-Id: I6d69ac96597f27575dd40e4c80c982f06fa88f51
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>

5 files changed, 18 insertions, 18 deletions

diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp
index c3d41a27bf..424a19c752 100644
--- a/tests/auto/gui/text/qfont/tst_qfont.cpp
+++ b/tests/auto/gui/text/qfont/tst_qfont.cpp
@@ -613,7 +613,7 @@ void tst_QFont::lastResortFont()
 
 void tst_QFont::styleName()
 {
-#if !defined(Q_WS_MAC)
+#if !defined(Q_OS_MAC)
     QSKIP("Only tested on Mac");
 #else
     QFont font("Helvetica Neue");
diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
index e7bbfbceff..edaaf33a39 100644
--- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
@@ -63,7 +63,7 @@ private slots:
     void fixedPitch_data();
     void fixedPitch();
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     void trickyFonts_data();
     void trickyFonts();
 #endif
@@ -132,7 +132,7 @@ void tst_QFontDatabase::fixedPitch_data()
     QTest::newRow( "Andale Mono" ) << QString( "Andale Mono" ) << true;
     QTest::newRow( "Courier" ) << QString( "Courier" ) << true;
     QTest::newRow( "Courier New" ) << QString( "Courier New" ) << true;
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
     QTest::newRow( "Script" ) << QString( "Script" ) << false;
     QTest::newRow( "Lucida Console" ) << QString( "Lucida Console" ) << true;
     QTest::newRow( "DejaVu Sans" ) << QString( "DejaVu Sans" ) << false;
@@ -162,7 +162,7 @@ void tst_QFontDatabase::fixedPitch()
     QCOMPARE(fi.fixedPitch(), fixedPitch);
 }
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 void tst_QFontDatabase::trickyFonts_data()
 {
     QTest::addColumn<QString>("font");
@@ -247,7 +247,7 @@ void tst_QFontDatabase::addAppFont()
 #endif
     QCOMPARE(fontDbChangedSpy.count(), 1);
 // addApplicationFont is supported on Mac, don't skip the test if it breaks.
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
     if (id == -1)
         QSKIP("Skip the test since app fonts are not supported on this system");
 #endif
diff --git a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
index a0cda39c27..a61f625fde 100644
--- a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
+++ b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
@@ -98,7 +98,7 @@ private slots:
     void rawFontSetPixelSize_data();
     void rawFontSetPixelSize();
 
-#if defined(Q_WS_X11) || defined(Q_WS_MAC)
+#if defined(Q_WS_X11) || defined(Q_OS_MAC)
     void multipleRawFontsFromData();
 #endif
 private:
@@ -867,7 +867,7 @@ void tst_QRawFont::rawFontSetPixelSize()
     QCOMPARE(rawFont.pixelSize(), 24.0);
 }
 
-#if defined(Q_WS_X11) || defined(Q_WS_MAC)
+#if defined(Q_WS_X11) || defined(Q_OS_MAC)
 void tst_QRawFont::multipleRawFontsFromData()
 {
     QFile file(testFont);
diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index e816b04153..2c972bdee8 100644
--- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
@@ -300,7 +300,7 @@ void tst_QTextLayout::simpleBoundingRect()
 
 void tst_QTextLayout::threeLineBoundingRect()
 {
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
     QSKIP("QTestFontEngine on the mac does not support logclusters at the moment");
 #endif
     /* stricter check. break text into three lines */
@@ -419,7 +419,7 @@ void tst_QTextLayout::forcedBreaks()
 
 void tst_QTextLayout::breakAny()
 {
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
     QSKIP("QTestFontEngine on the mac does not support logclusters at the moment");
 #endif
     QString text = "ABCD";
@@ -461,7 +461,7 @@ void tst_QTextLayout::breakAny()
 
 void tst_QTextLayout::noWrap()
 {
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
     QSKIP("QTestFontEngine on the mac does not support logclusters at the moment");
 #endif
     QString text = "AB CD";
@@ -605,7 +605,7 @@ void tst_QTextLayout::charWordStopOnLineSeparator()
 
 void tst_QTextLayout::xToCursorAtEndOfLine()
 {
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
     QSKIP("QTestFontEngine on the mac does not support logclusters at the moment");
 #endif
     QString text = "FirstLine SecondLine";
@@ -667,7 +667,7 @@ void tst_QTextLayout::charStopForSurrogatePairs()
 
 void tst_QTextLayout::tabStops()
 {
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
     QSKIP("QTestFontEngine on the mac does not support logclusters at the moment");
 #endif
     QString txt("Hello there\tworld");
@@ -1461,7 +1461,7 @@ void tst_QTextLayout::textWidthWithLineSeparator()
 
 void tst_QTextLayout::cursorInLigatureWithMultipleLines()
 {
-#if !defined(Q_WS_MAC)
+#if !defined(Q_OS_MAC)
     QSKIP("This test can only be run on Mac");
 #endif
     QTextLayout layout("first line finish", QFont("Times", 20));
@@ -1477,7 +1477,7 @@ void tst_QTextLayout::cursorInLigatureWithMultipleLines()
 
 void tst_QTextLayout::xToCursorForLigatures()
 {
-#if !defined(Q_WS_MAC)
+#if !defined(Q_OS_MAC)
     QSKIP("This test can only be run on Mac");
 #endif
     QTextLayout layout("fi", QFont("Times", 20));
@@ -1501,7 +1501,7 @@ void tst_QTextLayout::xToCursorForLigatures()
 
 void tst_QTextLayout::cursorInNonStopChars()
 {
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
     QSKIP("This test can not be run on Mac");
 #endif
     QTextLayout layout(QString::fromUtf8("\xE0\xA4\xA4\xE0\xA5\x8D\xE0\xA4\xA8"));
diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
index 73678585d6..82a4e341b2 100644
--- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
+++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
@@ -56,7 +56,7 @@
 
 
 
-#if defined(Q_WS_X11) || defined(Q_WS_MAC)
+#if defined(Q_WS_X11) || defined(Q_OS_MAC)
 #define private public
 #include <private/qtextengine_p.h>
 #include <qtextlayout.h>
@@ -1163,7 +1163,7 @@ void tst_QTextScriptEngine::controlInSyllable_qtbug14204()
 
 void tst_QTextScriptEngine::combiningMarks_qtbug15675()
 {
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
     QString s;
     s.append(QChar(0x0061));
     s.append(QChar(0x0062));
@@ -1213,7 +1213,7 @@ void tst_QTextScriptEngine::mirroredChars_data()
 
 void tst_QTextScriptEngine::mirroredChars()
 {
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
     QSKIP("Not supported on Mac");
 #endif
     QFETCH(int, hintingPreference);