summaryrefslogtreecommitdiffstats
path: root/util/cmake/pro2cmake.py
diff options
context:
space:
mode:
authorQt CI Bot <qt_ci_bot@qt-project.org>2021-04-15 18:29:29 +0000
committerQt CI Bot <qt_ci_bot@qt-project.org>2021-04-15 18:29:29 +0000
commit92d351089bf7e285c9800342ff72205c04984f6c (patch)
treeefa9462a336243111363d8d2ab5bc04ede135157 /util/cmake/pro2cmake.py
parentd52a57760f4031a0aff3c6e05c71177553f74905 (diff)
parentcf27a23937b108f7f8492a7873f71bc71c368dfb (diff)
Merge integration refs/builds/qtci/dev/1618486203
Diffstat (limited to 'util/cmake/pro2cmake.py')
-rwxr-xr-xutil/cmake/pro2cmake.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index 6f4f741c1a7..f17248bf019 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -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)