path: root/configure.pri
diff options
authorOswald Buddenhagen <>2017-02-17 09:45:05 +0100
committerOswald Buddenhagen <>2017-02-24 16:39:46 +0000
commit76d667eff56afa8d3dbd61515b38762038fcb1ba (patch)
treed096587b695412684bfbaa09815e2d88778e5517 /configure.pri
parent611b7c9ce77f1b02fc389583c24fbe7d49cce8a8 (diff)
make an effort to keep /src properties constant
writing $$PWD (via $$QT_SOURCE_TREE) into the new bin/qt.conf would potentially change the path compared to the value originally written by the configure script, as $$PWD is canonicalized. this in turn would break the magic for delaying the loading of toolchain.prf. so instead just write out the perfectly fine current value of $$[QT_INSTALL_PREFIX/src]. amends 169a40d51, thereby fixing 6834d0eec on windows. Task-number: QTBUG-58816 Change-Id: Ibbd44df8f3c825a97d9f4acb869e44c93acb835b Reviewed-by: Joerg Bornemann <> Reviewed-by: Jake Petroules <>
Diffstat (limited to 'configure.pri')
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.pri b/configure.pri
index a5e77411ee..30e31ddbcd 100644
--- a/configure.pri
+++ b/configure.pri
@@ -805,7 +805,7 @@ defineTest(qtConfOutput_preparePaths) {
cont += \
"[EffectiveSourcePaths]" \
- "Prefix=$$QT_SOURCE_TREE"
+ "Prefix=$$[QT_INSTALL_PREFIX/src]"
write_file($$QT_BUILD_TREE/bin/qt.conf, cont)|error()