Changeset 357 for trunk/src/corelib/global

Timestamp:

Nov 28, 2009, 8:49:40 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Make the Qt library portable on OS/2 by replacing hard-coded paths with paths relative to the QtCore DLL (or the application executable if Qt is built as a static library). Add two new locations to search for qt.conf/qtsys.conf for providing more portability and easier system integration. See #78 for more details.

File:

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

trunk/src/corelib/global/qlibraryinfo.cpp

@@ -41 +41 @@
 
 #include "qdir.h"
-#include "qfile.h"    
+#include "qfile.h"
 #include "qconfig.h"
 #include "qsettings.h"
@@ -58 +58 @@
 #  include "private/qcore_mac_p.h"
 #endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 #include "qconfig.cpp"
@@ -137 +159 @@
                 qtconfig = pwd.filePath(QLatin1String("qt.conf"));
             }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 #endif
@@ -296 +338 @@
         }
 
-        if (path)
+        if (path)
             ret = QString::fromLocal8Bit(path);
+
+
+
+
+
+
+
+
+
+
+
+
     } else {
         QString key;
@@ -431 +485 @@
             // we make the prefix path absolute to the executable's directory
 #ifdef QT_BUILD_QMAKE
-            return QFileInfo(qmake_libraryInfoFile()).absolutePath();
+            QFileInfo fi(qmake_libraryInfoFile());
+            return QDir::cleanPath(QDir(fi.absolutePath()).absoluteFilePath(ret));
 #else
+
+
+
+
+
+
+
+
+
+
             if (QCoreApplication::instance()) {
 #ifdef Q_OS_MAC
@@ -444 +509 @@
                 }
 #endif
-                return QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(ret);
+                return QDir);
             } else {
                 return QDir::current().absoluteFilePath(ret);
@@ -451 +516 @@
         } else {
             // we make any other path absolute to the prefix directory
-            return QDir(location(PrefixPath)).absoluteFilePath(ret);
+            return QDir);
         }
     }
-    return ret;
+    return ;
 }