diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-14 13:20:55 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-16 13:53:04 +0200 |
| commit | 1f9ec097b2171f9773b8285c67a2f852d680a73a (patch) | |
| tree | a6d9958b227b4dd74c0ba5c0101127be037ed83a /cmake | |
| parent | d72ff6ffd0e6f04dcd614b020f9abbe129615f8c (diff) | |
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 <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtAppHelpers.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtExecutableHelpers.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cmake/QtAppHelpers.cmake b/cmake/QtAppHelpers.cmake index 9958b134aa..e7f96b8c52 100644 --- a/cmake/QtAppHelpers.cmake +++ b/cmake/QtAppHelpers.cmake @@ -93,7 +93,7 @@ function(qt_internal_finalize_app target) qt_internal_update_app_target_info_properties("${target}") if(WIN32) - qt6_generate_win32_rc_file("${target}") + _qt_internal_generate_win32_rc_file("${target}") endif() # Rpaths need to be applied in the finalizer, because the MACOSX_BUNDLE property might be diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake index ad2ce9f30c..27aeaf62b2 100644 --- a/cmake/QtExecutableHelpers.cmake +++ b/cmake/QtExecutableHelpers.cmake @@ -68,7 +68,7 @@ function(qt_internal_add_executable name) endif() if (WIN32 AND NOT arg_DELAY_RC) - qt6_generate_win32_rc_file(${name}) + _qt_internal_generate_win32_rc_file(${name}) endif() qt_set_common_target_properties(${name}) 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" |