diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-10-02 16:13:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-04 09:09:15 +0200 |
| commit | b4bf76fffce4dfac1363d83a823a5f26541cd929 (patch) | |
| tree | 16f3219d7c3f20886c8feb5e94bc7c2bfee7f5a0 /tests/auto/corelib/tools/qlocale | |
| parent | 122b09c1d0204f31163708fde1f5da09e94a6157 (diff) | |
tst_QLocale: remove QSKIP, wrap Q_OS_MAC/Q_OS_WIN
Change-Id: I44755379561b98e43dd19c8c01b40349be203e14
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tests/auto/corelib/tools/qlocale')
| -rw-r--r-- | tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp index 0bf8089262..af9f03c551 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -87,8 +87,12 @@ public: private slots: void initTestCase(); +#ifdef Q_OS_WIN void windowsDefaultLocale(); +#endif +#ifdef Q_OS_MAC void macDefaultLocale(); +#endif void ctor(); void emptyCtor(); @@ -1109,11 +1113,9 @@ void tst_QLocale::toDateTime() QCOMPARE(l.toDateTime(string, QLocale::LongFormat), result); } +#ifdef Q_OS_MAC void tst_QLocale::macDefaultLocale() { -#ifndef Q_OS_MAC - QSKIP("This is a Mac OS X-only test"); -#endif QLocale locale = QLocale::system(); if (locale.name() != QLatin1String("en_US")) @@ -1192,6 +1194,7 @@ void tst_QLocale::macDefaultLocale() QCOMPARE(locale.weekdays(), days); } +#endif // Q_OS_MAC #ifdef Q_OS_WIN #include <qt_windows.h> @@ -1247,9 +1250,9 @@ public: #endif // Q_OS_WIN +#ifdef Q_OS_WIN void tst_QLocale::windowsDefaultLocale() { -#ifdef Q_OS_WIN RestoreLocaleHelper systemLocale; // set weird system defaults and make sure we're using them setWinLocaleInfo(LOCALE_SDECIMAL, QLatin1String("@")); @@ -1283,8 +1286,8 @@ void tst_QLocale::windowsDefaultLocale() QCOMPARE(locale.toString(QDateTime(QDate(1974, 12, 1), QTime(1,2,3)), QLocale::LongFormat), QString("1@12@1974 1^2^3")); QCOMPARE(locale.toString(QTime(1,2,3), QLocale::LongFormat), QString("1^2^3")); -#endif // #ifdef Q_OS_WIN } +#endif // #ifdef Q_OS_WIN void tst_QLocale::numberOptions() { |