diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-09-29 09:39:33 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-03 07:57:41 +0200 |
| commit | f18b690cca2de6c75e70a2fd5871edf9fa993a5e (patch) | |
| tree | 7884c18b46777aa0af313f4a1ee0993f82ba1152 /tests/auto/corelib/tools | |
| parent | c3d9d3698674a2240aa97403e3b684894d6f19db (diff) | |
Tests: Fix compilation on Windows.
Replace Q_WS_... by Q_OS_... in corelib tests.
Change-Id: I14c41dca1ec490b3c49ba2c24e60def14c6de9da
Reviewed-on: http://codereview.qt-project.org/5778
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib/tools')
| -rw-r--r-- | tests/auto/corelib/tools/qstring/tst_qstring.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qstringref/tst_qstringref.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp index 1721f80a8f..dc912f786e 100644 --- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp @@ -2127,7 +2127,7 @@ void tst_QString::remove_regexp() void tst_QString::toNum() { -#if defined (Q_WS_WIN) && defined (Q_CC_MSVC) +#if defined (Q_OS_WIN) && defined (Q_CC_MSVC) #define TEST_TO_INT(num, func) \ a = #num; \ QVERIFY2(a.func(&ok) == num ## i64 && ok, "Failed: num=" #num ", func=" #func); @@ -2165,7 +2165,7 @@ void tst_QString::toNum() #undef TEST_TO_INT -#if defined (Q_WS_WIN) && defined (Q_CC_MSVC) +#if defined (Q_OS_WIN) && defined (Q_CC_MSVC) #define TEST_TO_UINT(num, func) \ a = #num; \ QVERIFY2(a.func(&ok) == num ## i64 && ok, "Failed: num=" #num ", func=" #func); @@ -4352,7 +4352,7 @@ void tst_QString::localeAwareCompare() QCOMPARE(locale, GetThreadLocale()); # endif -#elif defined (Q_WS_MAC) +#elif defined (Q_OS_MAC) QSKIP("Setting the locale is not supported on OS X (you can set the C locale, but that won't affect CFStringCompare which is used to compare strings)", SkipAll); #elif defined(QT_USE_ICU) QLocale::setDefault(QLocale(locale)); diff --git a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp index dbf8ee73fc..2697058f2a 100644 --- a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp +++ b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp @@ -102,7 +102,7 @@ Q_DECLARE_METATYPE(IntList) #include <float.h> #include <limits.h> #include <math.h> -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) # include <windows.h> // mingw defines NAN and INFINITY to 0/0 and x/0 # if defined(Q_CC_GNU) |