summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/styles/qstyle
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-07-16 14:46:08 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-16 16:30:55 +0200
commita89c7e4020591e27ba265fa082b83440f2afa3b2 (patch)
tree89e22e9c07e69d4ccd757e4cd7baa6e40cdd634a /tests/auto/widgets/styles/qstyle
parent887607e956531dd1f51498367b0518c1f8602c90 (diff)
Replace Q_WS_ in tests by Q_OS_ or check platform names.
Change-Id: Ica445cf1e83bfaab870ac344d6c02766f047a5cc Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'tests/auto/widgets/styles/qstyle')
-rw-r--r--tests/auto/widgets/styles/qstyle/tst_qstyle.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
index d9862affed..63711eec27 100644
--- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
+++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
@@ -79,7 +79,7 @@
#include <QMacStyle>
#endif
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
#include <QWindowsXPStyle>
#include <QWindowsVistaStyle>
#endif
@@ -211,7 +211,7 @@ void tst_QStyle::testStyleFactory()
#ifndef QT_NO_STYLE_MOTIF
QVERIFY(keys.contains("Motif"));
#endif
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
if (QSysInfo::WindowsVersion >= QSysInfo::WV_XP &&
(QSysInfo::WindowsVersion & QSysInfo::WV_NT_based))
QVERIFY(keys.contains("WindowsXP"));
@@ -416,7 +416,7 @@ void tst_QStyle::testWindowsStyle()
#ifndef QT_NO_STYLE_WINDOWSXP
void tst_QStyle::testWindowsXPStyle()
{
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
QWindowsXPStyle xpstyle;
QVERIFY(testAllFunctions(&xpstyle));
lineUpLayoutTest(&xpstyle);
@@ -442,7 +442,7 @@ QImage readImage(const QString &fileName)
void tst_QStyle::testWindowsVistaStyle()
{
-#if defined(Q_WS_WIN) && !defined(QT_NO_STYLE_WINDOWSVISTA)
+#if defined(Q_OS_WIN) && !defined(QT_NO_STYLE_WINDOWSVISTA)
QWindowsVistaStyle vistastyle;
QVERIFY(testAllFunctions(&vistastyle));