From 1f9ec097b2171f9773b8285c67a2f852d680a73a Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 14 Oct 2020 13:20:55 +0200 Subject: CMake: Rename some public API functions Some of them have a different (hopefully better) name now. Some are marked as Technical Preview. Some are renamed to be internal. Marking add_qt_gui_executable as TP with the intention to un-TP it after we rename it and change its behavior as discussed in the API review meeting. Additional changes to add_qt_gui_executable and qt6_add_resources have been filed as separate tasks that will be worked on separately. See comments on PS1 for details. Task-number: QTBUG-86827 Change-Id: I56a84a1943b0902bb807310dc620eb381824e8dd Reviewed-by: Joerg Bornemann --- cmake/QtModuleHelpers.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmake/QtModuleHelpers.cmake') diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 97a25fa38e..5506649439 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -146,7 +146,7 @@ function(qt_internal_add_module target) qt_internal_apply_win_prefix_and_suffix("${target}") if (WIN32 AND BUILD_SHARED_LIBS) - qt6_generate_win32_rc_file(${target}) + _qt_internal_generate_win32_rc_file(${target}) endif() endif() @@ -476,7 +476,7 @@ set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})") else() set(args INSTALL_DIR "${metatypes_install_dir}") endif() - qt6_generate_meta_types_json_file(${target} ${args}) + qt6_extract_metatypes(${target} ${args}) endif() configure_package_config_file( "${QT_CMAKE_DIR}/QtModuleConfig.cmake.in" -- cgit v1.2.3