Changeset 1030 for trunk/qmake/option.cpp

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/qmake/option.cpp (modified) (3 diffs)

trunk/qmake/option.cpp

@@ -774 +774 @@
 QString qmake_libraryInfoFile()
 {
+
     QString ret;
 #if defined(Q_OS_WIN)
@@ -788 +789 @@
         DosQueryModuleName(ppib->pib_hmte, sizeof(appFileName), appFileName);
     }
-    ret = QFileInfo(QString::fromLocal8Bit(appFileName)).absolutePath() +
-                    QLatin1String("/qt.conf");
-    if (!QFile::exists(ret)) {
-        // search in the system-wide location
-        ret = QString::fromLocal8Bit(qgetenv("ETC"));
-        if (ret.isEmpty())
-            ret = QDir::rootPath();
-        ret = ret + QLatin1String("/qtsys.conf");
-    }
-    return QDir::cleanPath(ret);
+    ret = QFileInfo(QString::fromLocal8Bit(appFileName)).filePath();
 #else
     QString argv0 = QFile::decodeName(QByteArray(Option::application_argv0));
@@ -839 +831 @@
     ret = fi.exists() ? fi.canonicalFilePath() : QString();
 #endif
-#if !defined(Q_OS_OS2)
     if(!ret.isEmpty())
         ret = QDir(QFileInfo(ret).absolutePath()).filePath("qt.conf");
     return ret;
-#endif
 }