aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2022-02-11 15:45:33 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-02-16 09:43:05 +0000
commitfde0b4ac747108e65cfd56f0f14dcff0190186c2 (patch)
tree43581b022ebf1a56c70d5a6bfbd05d9d35f47042
parent768d992d70a209e6cb15397413d6c0eb39782d34 (diff)
CMake: Rename QT_QML_MODULE_FOLLOW_FOREIGN_VERSIONING to be internal
Rename it to _qt_qml_module_follow_foreign_versioning to make it more clear it's an internal property. Amends 9cd3191d4eb42dbf7847ffccb178fe5402968464 Fixes: QTBUG-100213 Change-Id: I7e6c45800e9e68d5837b906bf349a58330892f86 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit d7d6c0d13c415b71aeab1f8cc95b22a3fcb79d5b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qml/Qt6QmlMacros.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake
index 97e7845ba7..3e69d5d12e 100644
--- a/src/qml/Qt6QmlMacros.cmake
+++ b/src/qml/Qt6QmlMacros.cmake
@@ -438,7 +438,7 @@ function(qt6_add_qml_module target)
QT_QML_MODULE_NO_PLUGIN "${arg_NO_PLUGIN}"
QT_QML_MODULE_NO_PLUGIN_OPTIONAL "${arg_NO_PLUGIN_OPTIONAL}"
QT_QML_MODULE_NO_IMPORT_SCAN "${arg_NO_IMPORT_SCAN}"
- QT_QML_MODULE_FOLLOW_FOREIGN_VERSIONING "${arg_FOLLOW_FOREIGN_VERSIONING}"
+ _qt_qml_module_follow_foreign_versioning "${arg_FOLLOW_FOREIGN_VERSIONING}"
QT_QML_MODULE_URI "${arg_URI}"
QT_QML_MODULE_TARGET_PATH "${arg_TARGET_PATH}"
QT_QML_MODULE_VERSION "${arg_VERSION}"
@@ -2162,7 +2162,8 @@ function(_qt_internal_qml_type_registration target)
# Add --follow-foreign-versioning if requested
- get_target_property(follow_foreign_versioning ${target} QT_QML_MODULE_FOLLOW_FOREIGN_VERSIONING)
+ get_target_property(follow_foreign_versioning ${target}
+ _qt_qml_module_follow_foreign_versioning)
if (follow_foreign_versioning)
list(APPEND cmd_args