1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Do not write Effective[Source]Paths to target_qt.conf

Browse Source 
This was needed, when the mkspecs directory was not present in the
non-prefix build directory. That's not the case anymore.

Pick-to: 6.0
Fixes: QTBUG-89182
Change-Id: I2b04c2d857b0af324e1d7c41ed1934a62275d6f1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-12-08 12:55:21 +01:00
parent cc81aae4b3
commit 192d37099d
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmake/QtQmakeHelpers.cmake
View File

@ -141,23 +141,6 @@ Prefix=${prefix}
") ")
endif() endif()
if(NOT QT_WILL_INSTALL)
# The shadow build directory of a non-prefix build does not contain a copy of the mkspecs
# directory. Let $$[QT_HOST_DATA/src] point to the qtbase source directory.
string(APPEND content "[EffectiveSourcePaths]
HostData=${CMAKE_CURRENT_SOURCE_DIR}
")
# Set $$[QT_HOST_DATA/get] to avoid falling back to the source dir where it isn't explicitly
# requested.
# Also make sure to specify the Prefix as well, because it doesn't get inherited from the
# [Paths] section.
string(APPEND content "[EffectivePaths]
HostData=${ext_prefix}
Prefix=${ext_prefix_relative_to_conf_file}
")
endif()
string(APPEND content string(APPEND content
"[Paths] "[Paths]
Prefix=${ext_prefix_relative_to_conf_file} Prefix=${ext_prefix_relative_to_conf_file}