From 99da0c164b02dca8f556c3186231e6b0723c532c Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Thu, 6 Feb 2020 15:58:09 +0100 Subject: Use INSTALL_QMLDIR instead of Qt6_DIR for qmltypes properties Change-Id: Ic7e6230656670ebe925530eea5e34b16b6fea59b Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- util/cmake/pro2cmake.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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") -- cgit v1.2.3