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

Reformat pro2cmake

Browse Source 
Change-Id: I97175e8edbd4b911397f5b03a646006eff32a5bc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
This commit is contained in:
Alexandru Croitor 2020-01-24 14:04:15 +01:00
parent f67d8ae2d4
commit 604aa83ad9
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/cmake/pro2cmake.py
View File

@ -3541,10 +3541,8 @@ def handle_app_or_lib(
install_dir = scope.expandString("QMLTYPES_INSTALL_DIR") install_dir = scope.expandString("QMLTYPES_INSTALL_DIR")
if install_dir: if install_dir:
install_dir = install_dir.replace( install_dir = install_dir.replace("$$[QT_INSTALL_QML]", "${Qt6_DIR}/../../../qml")
"$$[QT_INSTALL_QML]","${Qt6_DIR}/../../../qml" cm_fh.write(f'{spaces(indent+1)}QT_QML_MODULE_INSTALL_DIR "{install_dir}"\n')
)
cm_fh.write(f"{spaces(indent+1)}QT_QML_MODULE_INSTALL_DIR \"{install_dir}\"\n")
cm_fh.write(f"{spaces(indent)})\n\n") cm_fh.write(f"{spaces(indent)})\n\n")
cm_fh.write(f"qt6_qml_type_registration({target})\n") cm_fh.write(f"qt6_qml_type_registration({target})\n")