Changeset 901 for trunk/src/corelib/global/qlibraryinfo.cpp

Timestamp:

Jul 19, 2011, 11:45:13 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QLibraryInfo: Return paths with native separators as on Windows.

File:

• trunk/src/corelib/global/qlibraryinfo.cpp (modified) (3 diffs)

trunk/src/corelib/global/qlibraryinfo.cpp

@@ -522 +522 @@
 #ifdef BOOTSTRAPPING
         QFileInfo fi(qmake_libraryInfoFile());
-        return QDir::cleanPath(QDir(fi.absolutePath()).absoluteFilePath(ret));
+        ret QDir::cleanPath(QDir(fi.absolutePath()).absoluteFilePath(ret));
 #else
         QSettings *config = QLibraryInfoPrivate::configuration();
@@ -529 +529 @@
             // the directory we load qt[sys].conf from
             QFileInfo fi(config->fileName());
-            return QDir::cleanPath(QDir(fi.absolutePath()).absoluteFilePath(ret));
+            ret QDir::cleanPath(QDir(fi.absolutePath()).absoluteFilePath(ret));
         } else {
             // we make the prefix path absolute to the executable's directory
             if (QCoreApplication::instance()) {
-                return QDir::cleanPath(QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(ret));
+                ret = QDir::cleanPath(QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(ret));
+            } else {
+                ret = QDir::current().absoluteFilePath(ret);
             }
-            return QDir::current().absoluteFilePath(ret);
         }
 #endif
-    }
-
-    // we make any other path absolute to the prefix directory
-    return QDir::cleanPath(QDir(location(PrefixPath)).absoluteFilePath(ret));
-
-#else // #ifdef Q_OS_OS2
+    } else {
+        // we make any other path absolute to the prefix directory
+        ret = QDir::cleanPath(QDir(location(PrefixPath)).absoluteFilePath(ret));
+    }
+
+    return QDir::toNativeSeparators(ret);
+
+#else // Q_OS_OS2
 
     if (QDir::isRelativePath(ret)) {
@@ -575 +578 @@
     return QDir::cleanPath(ret);
 
-#endif // #ifdef Q_OS_OS2
+#endif // Q_OS_OS2
 }