Merge integration refs/builds/qtci/dev/1618486203

This commit is contained in:
Qt CI Bot 2021-04-15 18:29:29 +00:00
commit 92d351089b

View File

@ -4041,8 +4041,8 @@ def get_qml_import_version(scope: Scope, target: str) -> str:
if import_version:
replacements = [
("$$QT_MINOR_VERSION", "${CMAKE_PROJECT_VERSION_MINOR}"),
("$$QT_VERSION", "${CMAKE_PROJECT_VERSION}"),
("$$QT_MINOR_VERSION", "${PROJECT_VERSION_MINOR}"),
("$$QT_VERSION", "${PROJECT_VERSION}"),
]
for needle, replacement in replacements:
import_version = import_version.replace(needle, replacement)