Changeset 900 for trunk/src/corelib/global

Timestamp:

Jul 19, 2011, 11:32:34 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Use expandEnvVars() in qlibraryinfo.cpp on all platforms.

File:

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

trunk/src/corelib/global/qlibraryinfo.cpp

@@ -63 +63 @@
 #endif
 
+
+
+
+
 #ifdef QLIBRARYINFO_EPOCROOT
 # include "symbian/epocroot_p.h"
 #endif
 
+
+
+
+
+
+
 #ifdef Q_OS_OS2
-
-#include "qt_os2.h"
 
 static const char *qt_module_path()
@@ -87 +95 @@
 }
 
+
+
 // expands environment variables in the form $(ENVVAR)
 static QString expandEnvVars(const QString &str)
@@ -101 +111 @@
     return ret;
 }
-
-#endif // Q_OS_OS2
-
-#include "qconfig.cpp"
-
-QT_BEGIN_NAMESPACE
-
-extern void qDumpCPUFeatures(); // in qsimd.cpp
 
 #ifndef QT_NO_SETTINGS
@@ -499 +501 @@
             }
             ret = config->value(subKey + key, defaultValue).toString();
-#ifdef Q_OS_OS2
             ret = expandEnvVars(ret);
-#endif
-            // 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()));
-            }
 
 #ifdef QLIBRARYINFO_EPOCROOT
             // $${EPOCROOT} is a special case, resolve it similarly to qmake.
+
             QRegExp epocrootMatcher(QLatin1String("\\$\\$\\{EPOCROOT\\}"));
             if ((rep = epocrootMatcher.indexIn(ret)) != -1)