From a89c7e4020591e27ba265fa082b83440f2afa3b2 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 16 Jul 2012 14:46:08 +0200 Subject: Replace Q_WS_ in tests by Q_OS_ or check platform names. Change-Id: Ica445cf1e83bfaab870ac344d6c02766f047a5cc Reviewed-by: Joerg Bornemann --- tests/auto/widgets/styles/qstyle/tst_qstyle.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/widgets/styles/qstyle') 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 #endif -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN #include #include #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)); -- cgit v1.2.3