diff options
| -rw-r--r-- | src/plugins/qmldesigner/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp | 5 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index a7066e255b..01c35a266c 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 diff --git a/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp b/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp index 36c175414b..c0cfeacb97 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<Utils::FilePath> &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<Utils::FilePath> &f, const Project *project) f.reportResult(path, index++); return true; }); - f.reportFinished(); } } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 71bf9613a5..b8038a9282 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) |