diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-02-06 15:58:09 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-12 08:45:38 +0000 |
| commit | 99da0c164b02dca8f556c3186231e6b0723c532c (patch) | |
| tree | 6e7fcfaa334e2b2a20a9317c6fd14060c0817c74 | |
| parent | aa94565f896674321f791735e774bd620b63c175 (diff) | |
Use INSTALL_QMLDIR instead of Qt6_DIR for qmltypes properties
Change-Id: Ic7e6230656670ebe925530eea5e34b16b6fea59b
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rwxr-xr-x | util/cmake/pro2cmake.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 709ab01c39..f5e678acd4 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -3632,7 +3632,7 @@ def handle_app_or_lib( install_dir = scope.expandString("QMLTYPES_INSTALL_DIR") if install_dir: - install_dir = install_dir.replace("$$[QT_INSTALL_QML]", "${Qt6_DIR}/../../../qml") + install_dir = install_dir.replace("$$[QT_INSTALL_QML]", "${INSTALL_QMLDIR}") cm_fh.write(f'{spaces(indent+1)}QT_QML_MODULE_INSTALL_DIR "{install_dir}"\n') cm_fh.write(f"{spaces(indent)})\n\n") |