From 76d667eff56afa8d3dbd61515b38762038fcb1ba Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 17 Feb 2017 09:45:05 +0100 Subject: 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 --- configure.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.pri') 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) { !equals(QT_SOURCE_TREE, $$QT_BUILD_TREE): \ cont += \ "[EffectiveSourcePaths]" \ - "Prefix=$$QT_SOURCE_TREE" + "Prefix=$$[QT_INSTALL_PREFIX/src]" write_file($$QT_BUILD_TREE/bin/qt.conf, cont)|error() reload_properties() -- cgit v1.2.3