path: root/configure.pri
diff options
authorOswald Buddenhagen <>2016-12-20 12:34:20 +0100
committerOswald Buddenhagen <>2016-12-22 11:48:05 +0000
commita71b53d6004edb59ad1801f3281ef631fb38c7c4 (patch)
tree24f5bfeeb012985c3be1e98b1a0278b6b6d9929f /configure.pri
parent674430cea0edafc374552b4743e2da7d29143453 (diff)
fix sysrootification of install paths
initially, the idea was that QLibraryInfo would receive a pre-sysrootified ExtPrefix from the builtin qt.conf. matching this against the sysroot would then tell us whether to sysrootify the Prefix from a "regular" qt.conf as well. however, this would have lead to some major ugliness and inconsistency between the code paths, so i changed my mind. unfortunately, i failed to adjust the remaining code, leading to 169a40d51 entirely breaking sysrootification ... the proper (and nicely consistent) solution is to introduce a SysrootifyPrefix key to qt.conf. this is user-accessible as well, so as a bonus it is now possible to adjust the setting at qmake installation time. incidentally, this omission was the last thing that prevented using the same qmake host build for any imaginable configuration of the same qt version ... i think. Change-Id: Ic0eebf21f93651f6374628c0ad8b206d696a4a7e Reviewed-by: Andy Nichols <>
Diffstat (limited to 'configure.pri')
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri
index 92020abbbb..7dd1069c0b 100644
--- a/configure.pri
+++ b/configure.pri
@@ -680,6 +680,7 @@ defineReplace(printHostPaths) {
$$printInstallPath(HostLibraries, hostlibdir, lib) \
$$printInstallPath(HostData, hostdatadir, .) \
"Sysroot=$$config.input.sysroot" \
+ "SysrootifyPrefix=$$qmake_sysrootify" \
"TargetSpec=$$XSPEC" \