Changeset 813 for trunk/src/corelib

Timestamp:

Nov 4, 2010, 12:31:36 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QLibraryInfo uses the QT_CONFIGURE_QT_SYSCONF_FILE value on OS/2 to probe for the system-wide qt.conf file containing library paths. The old "%ETC%\qtsys.conf" file is still supported.

File:

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

trunk/src/corelib/global/qlibraryinfo.cpp

@@ -81 +81 @@
     }
     return path;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -161 +176 @@
         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("/qtsys.conf");
-            qtconfig = QDir::cleanPath(qtconfig);
+#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"));
+                }
+            }
         }
     }
@@ -341 +365 @@
             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(),
-                            QFile::decodeName(qgetenv(ret.mid(rep + 2,
-                                reg_var.matchedLength() - 3).toLatin1().constData()).constData()));
-            }
+            ret = expandEnvVars(ret);
 #endif
         }
@@ -468 +484 @@
             }
             ret = config->value(subKey + key, defaultValue).toString();
-            // 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(),
-                            QFile::decodeName(qgetenv(ret.mid(rep + 2,
-                                reg_var.matchedLength() - 3).toLatin1().constData()).constData()));
-            }
+#ifdef Q_OS_OS2
+            ret = expandEnvVars(ret);
+#endif
             config->endGroup();
         }