aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@qt.io>2021-07-21 15:43:55 +1000
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-23 13:37:03 +0000
commitf17866815548cce413aa2848635a68164270160c (patch)
tree7d61d50708c6f2d44385c0a6bb7f34b890d414c2
parente47aff4baff2f96fcfcf54c4cb5794be49ac1994 (diff)
Rename NO_GENERATE_SOURCE keyword of qt6_add_qml_plugin()
Fixes: QTBUG-95090 Change-Id: I8f38d74d7c69d30a7d5e34273450dc3aa0523604 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 4dc893bb7daf82c8198f7ebba0fbbb328eba9ca8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qml/Qt6QmlMacros.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake
index f3a692aec4..64e2cfec86 100644
--- a/src/qml/Qt6QmlMacros.cmake
+++ b/src/qml/Qt6QmlMacros.cmake
@@ -139,7 +139,7 @@ function(qt6_add_qml_module target)
set(no_gen_source)
if(arg_NO_GENERATE_PLUGIN_SOURCE)
- set(no_gen_source NO_GENERATE_SOURCE)
+ set(no_gen_source NO_GENERATE_PLUGIN_SOURCE)
endif()
set(lib_type "")
@@ -776,7 +776,7 @@ endfunction()
# obtained from there either, the standard default as provided by CMake
# (${CMAKE_CURRENT_BINARY_DIR}) will be used. (OPTIONAL)
#
-# NO_GENERATE_SOURCE: A .cpp file will be created for the plugin class
+# NO_GENERATE_PLUGIN_SOURCE: A .cpp file will be created for the plugin class
# by default and automatically added to the plugin target. Use this option to
# indicate that no such .cpp file should be generated. The caller is then
# responsible for providing their own plugin class. (OPTIONAL)
@@ -785,7 +785,7 @@ function(qt6_add_qml_plugin target)
set(args_option
STATIC
SHARED
- NO_GENERATE_SOURCE
+ NO_GENERATE_PLUGIN_SOURCE
)
set(args_single
@@ -943,7 +943,7 @@ function(qt6_add_qml_plugin target)
)
endif()
- if(NOT arg_NO_GENERATE_SOURCE)
+ if(NOT arg_NO_GENERATE_PLUGIN_SOURCE)
set(generated_cpp_file_name_base "${target}_${arg_CLASS_NAME}")
set(register_types_function_name "qml_register_types_${escaped_uri}")