2 files changed, 27 insertions, 19 deletions

diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index 0406aeb501..321525ca18 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -2496,6 +2496,12 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
 
         \snippet code/src_corelib_io_qsettings.cpp 7
 
+    \li On Mac OS X, permissions to access settings not belonging to the
+       current user (i.e. SystemScope) have changed with 10.7 (Lion). Prior to
+       that version, users having admin rights could access these. For 10.7 and
+       10.8 (Mountain Lion), only root can. However, 10.9 (Mavericks) changes
+       that rule again but only for the native format (plist files).
+
     \li On Unix and Mac OS X systems, the advisory file locking is disabled
        if NFS (or AutoFS or CacheFS) is detected to work around a bug in the
        NFS fcntl() implementation, which hangs forever if statd or lockd aren't
diff --git a/src/corelib/io/qsettings_mac.cpp b/src/corelib/io/qsettings_mac.cpp
index 23cff6af27..7d1fb1a7c5 100644
--- a/src/corelib/io/qsettings_mac.cpp
+++ b/src/corelib/io/qsettings_mac.cpp
@@ -405,7 +405,6 @@ QMacSettingsPrivate::QMacSettingsPrivate(QSettings::Scope scope, const QString &
     }
     // if no bundle identifier yet. use a hard coded string.
     if (domainName.isEmpty()) {
-        setStatus(QSettings::AccessError);
         domainName = QLatin1String("unknown-organization.trolltech.com");
     }
 
@@ -540,27 +539,30 @@ void QMacSettingsPrivate::sync()
             // only report failures for the primary file (the one we write to)
             if (!ok && i == 0 && hostNames[j] == hostName && status == QSettings::NoError) {
 #if 1
-                // work around what seems to be a bug in CFPreferences:
-                // don't report an error if there are no preferences for the application
-                QCFType<CFArrayRef> appIds = CFPreferencesCopyApplicationList(domains[i].userName,
-                                                                              hostNames[j]);
-
-                // iterate through all the applications and see if we're there
-                CFIndex size = CFArrayGetCount(appIds);
-                for (CFIndex k = 0; k < size; ++k) {
-                    const void *cfvalue = CFArrayGetValueAtIndex(appIds, k);
-                    if (CFGetTypeID(cfvalue) == CFStringGetTypeID()) {
-                        if (CFStringCompare(static_cast<CFStringRef>(cfvalue),
-                                            domains[i].applicationOrSuiteId,
-                                            kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
-                            setStatus(QSettings::AccessError);
-                            break;
+                if (QSysInfo::macVersion() < QSysInfo::MV_10_7) {
+                    // work around what seems to be a bug in CFPreferences:
+                    // don't report an error if there are no preferences for the application
+                    QCFType<CFArrayRef> appIds = CFPreferencesCopyApplicationList(domains[i].userName,
+                                                                                  hostNames[j]);
+
+                    // iterate through all the applications and see if we're there
+                    CFIndex size = CFArrayGetCount(appIds);
+                    for (CFIndex k = 0; k < size; ++k) {
+                        const void *cfvalue = CFArrayGetValueAtIndex(appIds, k);
+                        if (CFGetTypeID(cfvalue) == CFStringGetTypeID()) {
+                            if (CFStringCompare(static_cast<CFStringRef>(cfvalue),
+                                                domains[i].applicationOrSuiteId,
+                                                kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
+                                setStatus(QSettings::AccessError);
+                                break;
+                            }
                         }
                     }
-                }
-#else
-                setStatus(QSettings::AccessError);
+                } else
 #endif
+                {
+                    setStatus(QSettings::AccessError);
+                }
             }
         }
     }