diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2022-09-08 16:27:24 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2022-09-12 05:19:36 +0000 |
| commit | fecd60e62d9b9c4179dda277591f5628432c0216 (patch) | |
| tree | 7a2d36faa22357b82ff885df07432ba6fba1489c | |
| parent | c5e7d26580377175cb9129d575b9c24eea1c6d71 (diff) | |
Use --bare option in CMake-generated calls to QML tools
We pass the system import path(s) explicitly. We don't want the tools to
guess them.
Pick-to: 6.4 dev
Task-number: QTBUG-106365
Change-Id: I529d5e79fa0331e6994be0d8a659d4a4556be1dd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index 7443b6da25..3f1ede583b 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -785,6 +785,7 @@ function(_qt_internal_target_enable_qmllint target) set(cmd ${QT_TOOL_COMMAND_WRAPPER_PATH} ${QT_CMAKE_EXPORT_NAMESPACE}::qmllint + --bare ${import_args} ${qrc_args} ${qmllint_files} @@ -1350,6 +1351,7 @@ function(_qt_internal_target_enable_qmltc target) COMMAND ${QT_TOOL_COMMAND_WRAPPER_PATH} ${qmltc_executable} + --bare --header "${compiled_header}" --impl "${compiled_cpp}" ${common_args} @@ -2103,6 +2105,7 @@ function(qt6_target_qml_sources target) COMMAND ${QT_TOOL_COMMAND_WRAPPER_PATH} ${qmlcachegen_cmd} + --bare --resource-path "${file_resource_path}" ${cachegen_args} -o "${compiled_file}" |