summaryrefslogtreecommitdiffstats
path: root/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-10-22 17:23:46 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-10-26 13:46:49 +0100
commit5fa823491b3f1a3d6f8161639686a0fbc33e6f03 (patch)
tree49a9255bf2fa3e2cdbb65eadb991009fc7ce2f61 /cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
parent2096400d6e8249e49df049f9600073fb2219c97a (diff)
CMake: Fix automatic sysrootification detection for qmake
The way we detected whether SysrootifyPrefix needs to be set was incorrect. We checked if extprefix == prefix => SysrootifyPrefix should be true. But that was previously always the case for a non-prefix build, which means it was not possible to build apps (due to qmake expecting to find include dirs in the sysroot, despite the non-prefix Qt not being installed anywhere into the sysroot). Instead we should do what qmake does. Only set SysrootifyPrefix to true if extprefix was not provided and a sysroot is available. To make it work for iOS and Android, the sysroot detection code had to be moved earlier than the SysrootifyPrefix detection. Task-number: QTBUG-86053 Change-Id: Idcc1260a675fb2ef9ae27fc9dc42a68b30f763b8 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'cmake/QtBuildInternals/QtBuildInternalsConfig.cmake')
0 files changed, 0 insertions, 0 deletions