From 88b7f64e7385e51831b3a852c88d6bbcdc665d87 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Tue, 28 Jan 2020 16:35:25 +0100 Subject: [PATCH] Fix example generation without qmldir file Do not return when no qmldir file is present and no dynamic qmldir information is set. Change-Id: I04e458f69e4e4a6ec9b1e7ca7ba0b0f7520996f7 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- util/cmake/pro2cmake.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 8c82a796b9c..627a0402d87 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -3097,13 +3097,11 @@ def write_example( qmldir_file_path = qmldir_file_path_list[0] if qmldir_file_path_list else "qmldir" qmldir_file_path = os.path.join(os.getcwd(), qmldir_file_path[0]) + dynamic_qmldir = scope.get("DYNAMIC_QMLDIR") if os.path.exists(qmldir_file_path): qml_dir = QmlDir() qml_dir.from_file(qmldir_file_path) - else: - dynamic_qmldir = scope.get("DYNAMIC_QMLDIR") - if not dynamic_qmldir: - return None + elif dynamic_qmldir: qml_dir = QmlDir() qml_dir.from_lines(dynamic_qmldir) qml_dir_dynamic_imports = True