1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1618486203

Browse Source
This commit is contained in:
Qt CI Bot 2021-04-15 18:29:29 +00:00
commit 92d351089b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/cmake/pro2cmake.py
View File

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