From a985fa5c51d67473a5c8a6f5aae678a3de613c0d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 20 Mar 2012 18:55:28 +0100 Subject: make unspecified/empty HostPrefix fall back to Prefix this is needed for backwards-compatibility, and generally makes sense. Task-number: QTBUG-24839 Change-Id: I42b008a9dfb43cc2ebe49c8baa2c29f5d6a75897 Reviewed-by: Joerg Bornemann --- src/corelib/global/qlibraryinfo.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index dc68ea760c..d319b2e948 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -295,6 +295,12 @@ QLibraryInfo::rawLocation(LibraryLocation loc) 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) int rep; QRegExp reg_var(QLatin1String("\\$\\(.*\\)")); -- cgit v1.2.3