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

CMake: Use versionfull functions within our public API

Browse Source 
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 <cristian.adam@qt.io>
This commit is contained in:
Alexandru Croitor 2020-10-26 13:47:49 +01:00
parent 04e0306520
commit f7d3ff1fe6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/Qt6CoreMacros.cmake
View File

@ -437,7 +437,7 @@ function(qt6_add_executable target)
set_property(TARGET "${target}" PROPERTY CXX_VISIBILITY_PRESET default) set_property(TARGET "${target}" PROPERTY CXX_VISIBILITY_PRESET default)
set_property(TARGET "${target}" PROPERTY OBJC_VISIBILITY_PRESET default) set_property(TARGET "${target}" PROPERTY OBJC_VISIBILITY_PRESET default)
set_property(TARGET "${target}" PROPERTY OBJCXX_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() else()
add_executable("${target}" WIN32 MACOSX_BUNDLE ${ARGN}) add_executable("${target}" WIN32 MACOSX_BUNDLE ${ARGN})
endif() endif()
@ -1265,7 +1265,7 @@ function(qt6_add_plugin target)
set_property(TARGET "${target}" PROPERTY OUTPUT_NAME "${output_name}") set_property(TARGET "${target}" PROPERTY OUTPUT_NAME "${output_name}")
if (ANDROID) if (ANDROID)
qt_android_apply_arch_suffix("${target}") qt6_android_apply_arch_suffix("${target}")
set_target_properties(${target} set_target_properties(${target}
PROPERTIES PROPERTIES
LIBRARY_OUTPUT_NAME "plugins_${arg_TYPE}_${output_name}" LIBRARY_OUTPUT_NAME "plugins_${arg_TYPE}_${output_name}"