Changeset 1030 for trunk/src

Timestamp:

Aug 26, 2011, 7:48:22 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Remove suport for system-wide qt.conf files.

This turns not to be necessary. The new code is much simpler and has
less platform-dependent details. Note that hard-coded component paths
are now relative to the parent of the directory containing QtCore4.dll, not
to that directory itself as before. This in particular makes qt.conf not necessary
for the development builds at all.

For official (RPM) release builds, full hard-coded paths will be used so qt.conf
is not necessary at all. It will only be in use in portable ZIP distributions to
override these hard-coded paths of RPM builds.

File:

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

trunk/src/corelib/global/qlibraryinfo.cpp

@@ -176 +176 @@
     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)
+        // 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::fromNativeSeparators(qtconfig) + QLatin1String("/qt.conf");
         qtconfig = QDir::cleanPath(qtconfig);
-
-        if (!QFile::exists(qtconfig)) {
-            // search in the system-wide location
-#ifdef QT_CONFIGURE_QT_SYSCONF_FILE
-            qtconfig = expandEnvVars(QString::fromLocal8Bit(QT_CONFIGURE_QT_SYSCONF_FILE));
-            if (!QFile::exists(qtconfig))
-#endif
-            {
-                // search in %ETC% for backward compatibility
-                QString etc = QString::fromLocal8Bit(qgetenv("ETC"));
-                if (etc.isEmpty())
-                    etc = QDir::rootPath();
-                etc = QDir::fromNativeSeparators(etc);
-                qtconfig = QDir::cleanPath(etc + QLatin1String("/qt.conf"));
-                if (!QFile::exists(qtconfig)) {
-                    qtconfig = QDir::cleanPath(etc + QLatin1String("/qtsys.conf"));
-                }
-            }
-        }
     }
 #endif
@@ -516 +496 @@
 
 #ifdef Q_OS_OS2
-
-    // QDir::isRelativePath() isn't precise on OS/2 (see
-    // QDir::absoluteFilePath()) therefore we don't rely on it
+    // QDir::isRelativePath() isn't precise on OS/2 (see QDir::absoluteFilePath())
+    // therefore we don't rely on it
     if (loc == PrefixPath) {
 #ifdef BOOTSTRAPPING
@@ -526 +505 @@
         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
+            // if we read paths from qt
+            // t
             QFileInfo fi(config->fileName());
             ret = QDir::cleanPath(QDir(fi.absolutePath()).absoluteFilePath(ret));
         } else {
-            // we make the prefix path absolute to the executable's directory
-            if (QCoreApplication::instance()) {
-                ret = QDir::cleanPath(QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(ret));
-            } else {
-                ret = QDir::current().absoluteFilePath(ret);
-            }
+            // otherwise we make the prefix path absolute to the DLL/EXE directory
+            QString path = QString::fromLocal8Bit(qt_module_path());
+            ret = QDir::cleanPath(QDir(path).absoluteFilePath(ret));
         }
 #endif
@@ -543 +519 @@
         ret = QDir::cleanPath(QDir(location(PrefixPath)).absoluteFilePath(ret));
     }
-
     return QDir::toNativeSeparators(ret);
-
 #else // Q_OS_OS2
-
     if (QDir::isRelativePath(ret)) {
         if (loc == PrefixPath) {
@@ -577 +550 @@
     }
     return QDir::cleanPath(ret);
-
 #endif // Q_OS_OS2
 }