Changeset 357 for trunk/src

Timestamp:

Nov 28, 2009, 8:49:40 PM (16 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
+
+#ifdef Q_OS_OS2
+
+#include "qt_os2.h"
+
+static const char *qt_module_path()
+{
+    static char path[CCHMAXPATH] = {'\0'};
+    if (!path[0]) {
+        HMODULE hmod;
+        ULONG objNum, offset;
+        DosQueryModFromEIP(&hmod, &objNum, sizeof(path), path, &offset,
+                           (ULONG)qt_module_path);
+        DosQueryModuleName(hmod, sizeof(path), path);
+        char *slash = strrchr(path, '\\');
+        if (slash)
+            *slash = '\0';
+    }
+    return path;
+}
+
+#endif // Q_OS_OS2
 
 #include "qconfig.cpp"
@@ -137 +159 @@
                 qtconfig = pwd.filePath(QLatin1String("qt.conf"));
             }
+#ifdef Q_OS_OS2
+    if (!QFile::exists(qtconfig)) {
+        // search in the directory that contains the DLL or EXE where this
+        // code is located (e.g. QtCore.dll or app.exe if Qt is a static lib)
+        qtconfig = QString::fromLocal8Bit(qt_module_path());
+        qtconfig = QDir::fromNativeSeparators(qtconfig) +
+                   QLatin1String("/qt.conf");
+        qtconfig = QDir::cleanPath(qtconfig);
+
+        if (!QFile::exists(qtconfig)) {
+            // search in the system-wide location
+            qtconfig = QString::fromLocal8Bit(qgetenv("ETC"));
+            if (qtconfig.isEmpty())
+                qtconfig = QDir::rootPath();
+            qtconfig = QDir::fromNativeSeparators(qtconfig) +
+                       QLatin1String("/qt/qtsys.conf");
+            qtconfig = QDir::cleanPath(qtconfig);
+        }
+    }
+#endif
     }
 #endif
@@ -296 +338 @@
         }
 
-        if (path)
+        if (path) {
             ret = QString::fromLocal8Bit(path);
+#ifdef Q_OS_OS2
+            // expand environment variables in the form $(ENVVAR)
+            int rep;
+            QRegExp reg_var(QLatin1String("\\$\\(.*\\)"));
+            reg_var.setMinimal(true);
+            while((rep = reg_var.indexIn(ret)) != -1) {
+                ret.replace(rep, reg_var.matchedLength(),
+                            QString::fromLocal8Bit(qgetenv(ret.mid(rep + 2,
+                                reg_var.matchedLength() - 3).toLatin1().constData()).constData()));
+            }
+#endif
+        }
     } 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
+#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
@@ -444 +509 @@
                 }
 #endif
-                return QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(ret);
+                return QDir::cleanPath(QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(ret));
             } 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::cleanPath(QDir(location(PrefixPath)).absoluteFilePath(ret));
         }
     }
-    return ret;
+    return QDir::cleanPath(ret);
 }