aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2023-09-06 15:09:35 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-09-12 10:19:22 +0000
commit49e8aa08d528e7d4df767ef83ff76a479ed34a79 (patch)
treef18f965f56330d65a47b70b5cde529af532d4051
parent3ffd40116e9b6da93596c244e81abc32db1e5e77 (diff)
Fix the qmllint command line
Move qmllint arguments under the generator expression guard. Fixes: QTBUG-115328 Change-Id: I7835251f0bf77555b878ff765af1abc76c5c17bd Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 0e18b14fecfafb725c79068ac29707a6aaa6b87c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qml/Qt6QmlMacros.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake
index e4f0f84ed4..ab5f8352c2 100644
--- a/src/qml/Qt6QmlMacros.cmake
+++ b/src/qml/Qt6QmlMacros.cmake
@@ -832,8 +832,9 @@ function(_qt_internal_target_enable_qmllint target)
)
_qt_internal_assign_to_qmllint_targets_folder(${lint_target})
+ set(lint_args "--json" "${CMAKE_BINARY_DIR}/${lint_target}.json")
add_custom_target(${lint_target_json}
- COMMAND "$<${have_qmllint_files}:${cmd}>" --json ${CMAKE_BINARY_DIR}/${lint_target}.json
+ COMMAND "$<${have_qmllint_files}:${cmd};${lint_args}>"
COMMAND_EXPAND_LISTS
DEPENDS
${QT_CMAKE_EXPORT_NAMESPACE}::qmllint