From 327bec26bfa25a06f511eb361e65567086df29a7 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 1 Jul 2020 10:37:33 +0200 Subject: [PATCH 1/3] UnitTests: Temporary disable the tests I added QmlDesigner to the unit tests but I have no clue have this can work with CMake. We only want some source files and are preloading some other header. Change-Id: Iadf8ca09b7e63055d1e2ff231a15ef7be2891204 Reviewed-by: Tim Jenssen --- tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 71bf9613a5d..b8038a92820 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,4 @@ add_subdirectory(auto) add_subdirectory(manual) # add_subdirectory(tools) -add_subdirectory(unit) +# add_subdirectory(unit) From e0a39f4d3451ccf57e90c1203c2f9b2e10d93f8d Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 1 Jul 2020 14:24:47 +0200 Subject: [PATCH 2/3] QmlDesigner: Fix cmake build Change-Id: I2155c4730de5ece18a1e0595da0523aa8c42f7c4 Reviewed-by: Tim Jenssen --- src/plugins/qmldesigner/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 32c988b6492..f5714970161 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -390,7 +390,7 @@ extend_qtc_plugin(QmlDesigner SOURCES_PREFIX components/listmodeleditor SOURCES listmodeleditordialog.cpp listmodeleditordialog.h - listmodeleditordialog.cpp listmodeleditormodel.h + listmodeleditormodel.cpp listmodeleditormodel.h ) extend_qtc_plugin(QmlDesigner From 7252505879a031a08d92f7701b9184ca09ae80ec Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Wed, 1 Jul 2020 14:23:49 +0200 Subject: [PATCH 3/3] AssetExport: Avoid null pointer dereferencing Change-Id: Iea146c41800139bcf9bd8e917a47293ce3504cf4 Reviewed-by: Eike Ziller --- .../qmldesigner/assetexporterplugin/filepathmodel.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp b/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp index 36c175414b5..c0cfeacb972 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp @@ -41,8 +41,8 @@ Q_LOGGING_CATEGORY(loggerInfo, "qtc.designer.assetExportPlugin.filePathModel", Q void findQmlFiles(QFutureInterface &f, const Project *project) { - if (!project && !f.isCanceled()) - f.reportFinished({}); + if (!project || f.isCanceled()) + return; int index = 0; Utils::FilePaths qmlFiles = project->files([&f, &index](const Node* node) ->bool { @@ -54,7 +54,6 @@ void findQmlFiles(QFutureInterface &f, const Project *project) f.reportResult(path, index++); return true; }); - f.reportFinished(); } }