diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-07-14 08:33:49 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-07-14 18:33:19 +0000 |
commit | f1478825a2c3374abaaadf60459eb87b328151c9 (patch) | |
tree | e4c4a947490ff6d5527e6a9d32d700c09cc5abf7 | |
parent | c6d7bb4004c64641cf89959607a542586ca3fd1f (diff) |
CMake: Fix handling of additional prefixes
The foreach loop in _qt_internal_scan_qml_imports is supposed to iterate
over all prefixes, but it saw the list of prefixes as one element.
Remove the double quotes around the variable expansions.
This amends commit 8bf916bfcbd5a05ec7370179317cd6d3a7dbd905.
Task-number: QTBUG-104928
Change-Id: Iea179d6b886f94e86df6e19898ed66416414c629
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 2d50155ab96bdb7b3a9ffc37e88aed6b3c224682)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index d50d66f801..dcf6478399 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -2407,7 +2407,7 @@ but this file does not exist. Possible reasons include: # We have multiple installation prefixes: one per Qt repository (conan). Add those that have # a "qml" subdirectory. set(qml_import_paths) - foreach(root IN ITEMS "${QT6_INSTALL_PREFIX};${_qt_additional_packages_prefix_paths}") + foreach(root IN ITEMS ${QT6_INSTALL_PREFIX} ${_qt_additional_packages_prefix_paths}) set(candidate "${root}/${QT6_INSTALL_QML}") if(IS_DIRECTORY "${candidate}") list(APPEND qml_import_paths "${candidate}") |