From a92f029e2a2601984b8291b79a90572dbb3f1d33 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Thu, 25 Jul 2019 11:32:38 +0200 Subject: [PATCH] Fix QML_FILES conversion Use a the more appropriate scope.get_files() to retrieve the qml file list from the qmake project. This makes it more consitent with the rest of the conversion script and fixes some issues with incorrect aliases in qrc files. Change-Id: I8907516be9457ba0d60d14af53d241197637aa9f 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 96195745663..42beb34bcc8 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -1843,7 +1843,7 @@ def write_qml_plugin(cm_fh: typing.IO[str], if plugindump_dep: extra_lines.append('QML_PLUGINDUMP_DEPENDENCIES "{}"'.format(plugindump_dep)) - qml_files = scope.expand('QML_FILES') + qml_files = scope.get_files('QML_FILES', use_vpath=True) if qml_files: extra_lines.append('QML_FILES\n{}{}'.format( spaces(indent),