qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Ulf Hermann 2022-09-08 16:27:24 +02:00
parent c5e7d26580
commit fecd60e62d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qml/Qt6QmlMacros.cmake
View File

@ -785,6 +785,7 @@ function(_qt_internal_target_enable_qmllint target)
set(cmd set(cmd
${QT_TOOL_COMMAND_WRAPPER_PATH} ${QT_TOOL_COMMAND_WRAPPER_PATH}
${QT_CMAKE_EXPORT_NAMESPACE}::qmllint ${QT_CMAKE_EXPORT_NAMESPACE}::qmllint
--bare
${import_args} ${import_args}
${qrc_args} ${qrc_args}
${qmllint_files} ${qmllint_files}
@ -1350,6 +1351,7 @@ function(_qt_internal_target_enable_qmltc target)
COMMAND COMMAND
${QT_TOOL_COMMAND_WRAPPER_PATH} ${QT_TOOL_COMMAND_WRAPPER_PATH}
${qmltc_executable} ${qmltc_executable}
--bare
--header "${compiled_header}" --header "${compiled_header}"
--impl "${compiled_cpp}" --impl "${compiled_cpp}"
${common_args} ${common_args}
@ -2103,6 +2105,7 @@ function(qt6_target_qml_sources target)
COMMAND COMMAND
${QT_TOOL_COMMAND_WRAPPER_PATH} ${QT_TOOL_COMMAND_WRAPPER_PATH}
${qmlcachegen_cmd} ${qmlcachegen_cmd}
--bare
--resource-path "${file_resource_path}" --resource-path "${file_resource_path}"
${cachegen_args} ${cachegen_args}
-o "${compiled_file}" -o "${compiled_file}"