diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2024-01-17 17:46:12 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-01-18 20:55:21 +0000 |
| commit | 8b0409d8002b6fea540eb4974a880ecf68acd18a (patch) | |
| tree | 28ae372d44c2bf1b99d1b354ebf48a75c049deb6 | |
| parent | 4465415de1534d45191b9ec58289b39eb64f250e (diff) | |
CMake: Fix NO_LINT option to work properly
Even if NO_LINT was passed to qt_add_qml_module, qt_target_qml_sources
would read the property set by qt_add_qml_module too late, and would
still create a lint target.
Make sure we read the property earlier.
Pick-to: 6.5
Fixes: QTBUG-121206
Change-Id: I409b37cab6dc0583458142ff00447d4191b4ff61
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 3fb693d7dad9070d7c574fc320b35e5ca6a5d2c7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 48a5ebd140b17b1ac9ef8a579ba49566db6bb88c)
| -rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index b494fea391..eeb59898ef 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -1989,8 +1989,9 @@ function(qt6_target_qml_sources target) message(FATAL_ERROR "Unknown/unexpected arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - if (NOT arg_QML_FILES AND NOT arg_RESOURCES) - if(NOT arg_NO_LINT) + get_target_property(no_lint ${target} QT_QML_MODULE_NO_LINT) + if(NOT arg_QML_FILES AND NOT arg_RESOURCES) + if(NOT arg_NO_LINT AND NOT no_lint) _qt_internal_target_enable_qmllint(${target}) endif() @@ -2009,7 +2010,6 @@ function(qt6_target_qml_sources target) ) endif() - get_target_property(no_lint ${target} QT_QML_MODULE_NO_LINT) get_target_property(no_cachegen ${target} QT_QML_MODULE_NO_CACHEGEN) get_target_property(no_qmldir ${target} QT_QML_MODULE_NO_GENERATE_QMLDIR) get_target_property(resource_prefix ${target} QT_QML_MODULE_RESOURCE_PREFIX) |