Changeset 769 for trunk/src/corelib/io/qsettings.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/io/qsettings.cpp (modified) (3 diffs)

trunk/src/corelib/io/qsettings.cpp

@@ -1092 +1092 @@
 }
 
-static QString getPath(QSettings::Format format, QSettings::Scope scope)
-{
-    Q_ASSERT((int)QSettings::NativeFormat == 0);
-    Q_ASSERT((int)QSettings::IniFormat == 1);
-
+static void initDefaultPaths(QMutexLocker *locker)
+{
+    PathHash *pathHash = pathHashFunc();
     QString homePath = QDir::homePath();
     QString systemPath;
 
-    QMutexLocker locker(globalMutex());
-    PathHash *pathHash = pathHashFunc();
-    bool loadSystemPath = pathHash->isEmpty();
-    locker.unlock();
-
-    if (loadSystemPath) {
-        /*
-           QLibraryInfo::location() uses QSettings, so in order to
-           avoid a dead-lock, we can't hold the global mutex while
-           calling it.
-       */
-        systemPath = QLibraryInfo::location(QLibraryInfo::SettingsPath);
-        systemPath += QLatin1Char('/');
-    }
-
-    locker.relock();
+    locker->unlock();
+        
+    /*
+       QLibraryInfo::location() uses QSettings, so in order to
+       avoid a dead-lock, we can't hold the global mutex while
+       calling it.
+    */
+    systemPath = QLibraryInfo::location(QLibraryInfo::SettingsPath);
+    systemPath += QLatin1Char('/');
+
+    locker->relock();
     if (pathHash->isEmpty()) {
         /*
@@ -1173 +1166 @@
 #endif
     }
+
+
+
+
+
+
+
+
+
+
+
 
     QString result = pathHash->value(pathHashKey(format, scope));
@@ -3483 +3487 @@
     QMutexLocker locker(globalMutex());
     PathHash *pathHash = pathHashFunc();
+
+
     pathHash->insert(pathHashKey(format, scope), path + QDir::separator());
 }