summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-11-07 11:55:17 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-08 16:59:50 +0100
commit486261f40ced93c68d35769b7355dbf78eae79bb (patch)
tree1164896d2b7f6da3b4ba4499dbd24e6466a3cb13 /src
parent735738cc65a9dab648f29f976ffe7975f6fdc5b1 (diff)
fix QMAKE_{,X}SPEC when a qt.conf containing [Paths] is present
unlike for the paths which fall back to defaults based on the Prefix, the specs must fall back to the values from qconfig.cpp. Change-Id: I5f110621921cf278f2c3938a4ec5eb30a78c8502 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qlibraryinfo.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index be608a4950..25f827aed7 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -358,9 +358,13 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group)
ret = config->value(key, defaultValue).toString();
#ifdef QT_BOOTSTRAPPED
- if (ret.isEmpty() && loc == HostPrefixPath)
- ret = config->value(QLatin1String(qtConfEntries[PrefixPath].key),
- QLatin1String(qtConfEntries[PrefixPath].value)).toString();
+ if (ret.isEmpty()) {
+ if (loc == HostPrefixPath)
+ ret = config->value(QLatin1String(qtConfEntries[PrefixPath].key),
+ QLatin1String(qtConfEntries[PrefixPath].value)).toString();
+ else if (loc == TargetSpecPath || loc == HostSpecPath)
+ ret = QString::fromLocal8Bit(qt_configure_prefix_path_strs[loc] + 12);
+ }
#endif
// expand environment variables in the form $(ENVVAR)