AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make unspecified/empty HostPrefix fall back to Prefix

Browse Source 
this is needed for backwards-compatibility, and generally makes sense.

Task-number: QTBUG-24839
Change-Id: I42b008a9dfb43cc2ebe49c8baa2c29f5d6a75897
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-03-20 18:55:28 +01:00 committed by Qt by Nokia
parent b492f54b98
commit a985fa5c51
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/global/qlibraryinfo.cpp
View File

@ -295,6 +295,12 @@ QLibraryInfo::rawLocation(LibraryLocation loc)
ret = config->value(key, defaultValue).toString(); ret = config->value(key, defaultValue).toString();
#ifdef QT_BUILD_QMAKE
if (ret.isEmpty() && loc == HostPrefixPath)
ret = config->value(QLatin1String(qtConfEntries[PrefixPath].key),
QLatin1String(qtConfEntries[PrefixPath].value)).toString();
#endif
// expand environment variables in the form $(ENVVAR) // expand environment variables in the form $(ENVVAR)
int rep; int rep;
QRegExp reg_var(QLatin1String("\\$\\(.*\\)")); QRegExp reg_var(QLatin1String("\\$\\(.*\\)"));