diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:31 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:53 +0200 |
| commit | 6e5818f2bbc8443b9308252a5e1543e014ef439d (patch) | |
| tree | 07922adee2f13e818b9439c8a0bdf871dda59039 /tests/auto/corelib/io/qsettings/tst_qsettings.cpp | |
| parent | 32aac0a1c009ee940920fd12f277180dd80b8eff (diff) | |
| parent | deac55becd18efa4504eb686a1bb8081a5cd488a (diff) | |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640
Diffstat (limited to 'tests/auto/corelib/io/qsettings/tst_qsettings.cpp')
| -rw-r--r-- | tests/auto/corelib/io/qsettings/tst_qsettings.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index 914f88ecda..84fbfb4131 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -106,7 +106,9 @@ private slots: void testThreadSafety(); void testEmptyData(); void testResourceFiles(); +#ifdef Q_OS_MAC void fileName(); +#endif void isWritable_data(); void isWritable(); void registerFormat(); @@ -2576,9 +2578,10 @@ void tst_QSettings::testCaseSensitivity() } } +#ifdef Q_OS_MAC +// Please write a fileName() test for the other platforms void tst_QSettings::fileName() { -#ifdef Q_OS_MAC QSettings s1(QSettings::UserScope, "Apple", "Console"); QSettings s2(QSettings::UserScope, "Apple"); QSettings s3(QSettings::SystemScope, "Apple", "Console"); @@ -2642,10 +2645,8 @@ void tst_QSettings::fileName() QSettings s21(QSettings::SystemScope, QLatin1String(" ") + QChar(0xbd) + QLatin1String("Foo//:/Bar,,, Baz!()#"), "Console"); QCOMPARE(s21.fileName(), QString("/Library/Preferences/com.foo-bar-baz.Console.plist")); -#else - QSKIP("Please write a fileName() test for the other platforms"); -#endif } +#endif void tst_QSettings::isWritable_data() { |