From 50f939bfe8bdd63beca4aff06cbf1b2be1677624 Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Wed, 16 Dec 2020 12:06:07 +1100 Subject: [PATCH] CMake: Don't rely on versionless commands or targets existing Commands like qt6_finalize_executable() should not rely on versionless commands or targets being available, since they can be disabled by a build option. Pick-to: 6.0 Change-Id: I6a9ab6a9b6a6b731590e5b8c43f73b518ed38e81 Reviewed-by: Joerg Bornemann --- src/corelib/Qt6CoreMacros.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 626a3ad3f8..7a8fe80671 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -470,15 +470,15 @@ function(_qt_internal_create_executable target) add_executable("${target}" ${ARGN}) endif() - target_link_libraries("${target}" PRIVATE Qt::Core) + target_link_libraries("${target}" PRIVATE Qt6::Core) endfunction() # This function is currently in Technical Preview. # It's signature and behavior might change. function(qt6_finalize_executable target) if(ANDROID) - qt_android_generate_deployment_settings("${target}") - qt_android_add_apk_target("${target}") + qt6_android_generate_deployment_settings("${target}") + qt6_android_add_apk_target("${target}") endif() endfunction()