Changeset 851


Ignore:
Timestamp:
May 6, 2011, 6:16:27 PM (9 years ago)
Author:
Dmitry A. Kuminov
Message:

corelib: Restored lost piece of code while merging.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/corelib/global/qlibraryinfo.cpp

    r846 r851  
    502502            ret = expandEnvVars(ret);
    503503#endif
     504            // expand environment variables in the form $(ENVVAR)
     505            int rep;
     506            QRegExp reg_var(QLatin1String("\\$\\(.*\\)"));
     507            reg_var.setMinimal(true);
     508            while((rep = reg_var.indexIn(ret)) != -1) {
     509                ret.replace(rep, reg_var.matchedLength(),
     510                            QString::fromLocal8Bit(qgetenv(ret.mid(rep + 2,
     511                                reg_var.matchedLength() - 3).toLatin1().constData()).constData()));
     512            }
    504513
    505514#ifdef QLIBRARYINFO_EPOCROOT
Note: See TracChangeset for help on using the changeset viewer.