diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-09-16 18:13:25 +1000 |
|---|---|---|
| committer | Craig Scott <craig.scott@qt.io> | 2021-09-17 13:57:27 +1000 |
| commit | d47278fd09f73ddc34011ab980dafc23aa453e71 (patch) | |
| tree | 0e42ca68c36129de39b88fafbc248fc9d588a32e /src | |
| parent | eda1276f80e39d519c88e7a491ff1d960c7a4dac (diff) | |
Ensure _qt_is_android_executable is set for internal executables too
The _qt_is_android_executable property is normally set by the
_qt_internal_create_executable() command. But various other internal
commands don't route through that and go through
qt_internal_add_executable() instead. The former is used only by the
public API, the latter only by the internal API. Refactor both so that
the internal one calls the public one. This ensures all targets receive
the same base settings, including the _qt_is_android_executable
property.
Fixes: QTBUG-96085
Pick-to: 6.2
Change-Id: I157356872c9d942d7be5f1abbbcbac97961b1f40
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 699d277f2c..6e8825e44a 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -492,6 +492,7 @@ function(qt6_add_executable target) cmake_parse_arguments(PARSE_ARGV 1 arg "MANUAL_FINALIZATION" "" "") _qt_internal_create_executable("${target}" ${arg_UNPARSED_ARGUMENTS}) + target_link_libraries("${target}" PRIVATE Qt6::Core) if(arg_MANUAL_FINALIZATION) # Caller says they will call qt6_finalize_target() themselves later @@ -529,7 +530,6 @@ function(_qt_internal_create_executable target) add_executable("${target}" ${ARGN}) endif() - target_link_libraries("${target}" PRIVATE Qt6::Core) _qt_internal_set_up_static_runtime_library("${target}") endfunction() |