Changeset 851 for trunk/src

Timestamp:

May 6, 2011, 8:16:27 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Restored lost piece of code while merging.

File:

• trunk/src/corelib/global/qlibraryinfo.cpp (modified) (1 diff)

trunk/src/corelib/global/qlibraryinfo.cpp

@@ -502 +502 @@
             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