From f7d3ff1fe6de947438cab8b4d6af59bd63d04ab3 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 26 Oct 2020 13:47:49 +0100 Subject: CMake: Use versionfull functions within our public API This ensures that the public functions still work even if QT_NO_CREATE_VERSIONLESS_FUNCTIONS is true. Task-number: QTBUG-86827 Change-Id: I5654eb17ffe47a1b8e9d397e0477f5b82a762ae1 Reviewed-by: Cristian Adam --- src/corelib/Qt6CoreMacros.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 65ed95f0da..67adc95ad1 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -437,7 +437,7 @@ function(qt6_add_executable target) set_property(TARGET "${target}" PROPERTY CXX_VISIBILITY_PRESET default) set_property(TARGET "${target}" PROPERTY OBJC_VISIBILITY_PRESET default) set_property(TARGET "${target}" PROPERTY OBJCXX_VISIBILITY_PRESET default) - qt_android_apply_arch_suffix("${target}") + qt6_android_apply_arch_suffix("${target}") else() add_executable("${target}" WIN32 MACOSX_BUNDLE ${ARGN}) endif() @@ -1265,7 +1265,7 @@ function(qt6_add_plugin target) set_property(TARGET "${target}" PROPERTY OUTPUT_NAME "${output_name}") if (ANDROID) - qt_android_apply_arch_suffix("${target}") + qt6_android_apply_arch_suffix("${target}") set_target_properties(${target} PROPERTIES LIBRARY_OUTPUT_NAME "plugins_${arg_TYPE}_${output_name}" -- cgit v1.2.3