diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-10-18 18:40:39 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-21 10:37:56 +0200 |
| commit | bdc558019ac6660a32d20a428a8694ef6bd4d4d3 (patch) | |
| tree | 4814476739c5bc676a515340518abc0e7ac06756 /tests/auto/corelib/io/qsettings/tst_qsettings.cpp | |
| parent | a9d5627e6a7b82188e20064d2e397b00cff8f318 (diff) | |
tests: Replace Q_OS_MACX -> Q_OS_OSX
Use the correct identifier for the OS X operating system.
Change-Id: I7158a6b77e5e7418bc6b0a565f003500820a346d
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'tests/auto/corelib/io/qsettings/tst_qsettings.cpp')
| -rw-r--r-- | tests/auto/corelib/io/qsettings/tst_qsettings.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index f0fa860686..dc83cf2fc4 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -514,20 +514,20 @@ void tst_QSettings::ctor() QSettings settings5(format, QSettings::UserScope, "SoftWare.ORG", "killerApp"); if (format == QSettings::NativeFormat) { #if defined(Q_OS_WIN) || defined(Q_OS_DARWIN) -# ifdef Q_OS_MACX +# ifdef Q_OS_OSX if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8) QEXPECT_FAIL("native", "See QTBUG-32655", Continue); -# endif // Q_OS_MACX +# endif // Q_OS_OSX QCOMPARE(settings5.value("key 1").toString(), QString("gurgle")); #else QVERIFY(!settings5.contains("key 1")); #endif } else { #if defined(Q_OS_WIN) || defined(Q_OS_DARWIN) -# ifdef Q_OS_MACX +# ifdef Q_OS_OSX if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8) QEXPECT_FAIL("", "See QTBUG-32655", Continue); -# endif // Q_OS_MACX +# endif // Q_OS_OSX QCOMPARE(settings5.value("key 1").toString(), QString("gurgle")); #else QVERIFY(!settings5.contains("key 1")); @@ -3183,7 +3183,7 @@ void tst_QSettings::rainersSyncBugOnMac() { QSettings s3(format, QSettings::UserScope, "software.org", "KillerAPP"); -#ifdef Q_OS_MACX +#ifdef Q_OS_OSX if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8) QEXPECT_FAIL("native", "See QTBUG-32655", Continue); #endif |