Changeset 548

Timestamp:

Feb 8, 2010, 6:31:02 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Use the system-wide qtsys.conf if qt.conf isn't found in the qmake.exe's directory.

File:

• trunk/qmake/option.cpp (modified) (2 diffs)

trunk/qmake/option.cpp ¶

@@ -756 +756 @@
         DosQueryModuleName(ppib->pib_hmte, sizeof(appFileName), appFileName);
     }
-    filePath = QString::fromLocal8Bit(appFileName);
-    ret = filePath.filePath();
+    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);
 #else
     QString argv0 = QFile::decodeName(QByteArray(Option::application_argv0));
@@ -799 +807 @@
     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
 }