Changeset 366 for trunk/src

Timestamp:

Nov 30, 2009, 11:56:07 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib/global: Correct QLibraryPath after rolling back r355 and friends so that it still correctly resolves paths like '\some\dir'.

File:

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

trunk/src/corelib/global/qlibraryinfo.cpp

@@ -481 +481 @@
     }
 
+#ifdef Q_OS_OS2
+
+    // QDir::isRelativePath() isn't precise on OS/2 (see
+    // QDir::absoluteFilePath()) therefore we don't rely on it
+    if (loc == PrefixPath) {
+#ifdef QT_BUILD_QMAKE
+        QFileInfo fi(qmake_libraryInfoFile());
+        return QDir::cleanPath(QDir(fi.absolutePath()).absoluteFilePath(ret));
+#else
+        QSettings *config = QLibraryInfoPrivate::configuration();
+        if (config) {
+            // if we read paths from qt[sys].conf, the Prefix is relative to
+            // the directory we load qt[sys].conf from
+            QFileInfo fi(config->fileName());
+            return 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));
+            }
+            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
+
     if (QDir::isRelativePath(ret)) {
         if (loc == PrefixPath) {
@@ -488 +518 @@
             return QDir::cleanPath(QDir(fi.absolutePath()).absoluteFilePath(ret));
 #else
-#ifdef Q_OS_OS2
-            QSettings *config = QLibraryInfoPrivate::configuration();
-            if (config) {
-                // if we read paths from qt[sys].conf, the Prefix is relative to
-                // the directory we load qt[sys].conf from
-                QFileInfo fi(config->fileName());
-                return QDir::cleanPath(QDir(fi.absolutePath()).absoluteFilePath(ret));
-            }
-            else
-#endif
             if (QCoreApplication::instance()) {
 #ifdef Q_OS_MAC
@@ -520 +540 @@
     }
     return QDir::cleanPath(ret);
+
+#endif // #ifdef Q_OS_OS2
 }