feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/qds-1.59' into 4.13

Browse Source 
Change-Id: Ia5756102fa014a8376c8b277e9a50a112c594d35
This commit is contained in:
Tim Jenssen
2020-07-02 02:03:27 +02:00
parent 35564328b8 7252505879
commit 6c59ceb6e0
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/CMakeLists.txt
View File

@@ -390,7 +390,7 @@ extend_qtc_plugin(QmlDesigner
SOURCES_PREFIX components/listmodeleditor SOURCES_PREFIX components/listmodeleditor
SOURCES SOURCES
listmodeleditordialog.cpp listmodeleditordialog.h listmodeleditordialog.cpp listmodeleditordialog.h
listmodeleditordialog.cpp listmodeleditormodel.h listmodeleditormodel.cpp listmodeleditormodel.h
) )
extend_qtc_plugin(QmlDesigner extend_qtc_plugin(QmlDesigner

5
src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp
View File

@@ -41,8 +41,8 @@ Q_LOGGING_CATEGORY(loggerInfo, "qtc.designer.assetExportPlugin.filePathModel", Q
void findQmlFiles(QFutureInterface<Utils::FilePath> &f, const Project *project) void findQmlFiles(QFutureInterface<Utils::FilePath> &f, const Project *project)
{ {
if (!project && !f.isCanceled()) if (!project || f.isCanceled())
f.reportFinished({}); return;
int index = 0; int index = 0;
Utils::FilePaths qmlFiles = project->files([&f, &index](const Node* node) ->bool { 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++); f.reportResult(path, index++);
return true; return true;
}); });
f.reportFinished();
} }
} }

2
tests/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_subdirectory(auto) add_subdirectory(auto)
add_subdirectory(manual) add_subdirectory(manual)
# add_subdirectory(tools) # add_subdirectory(tools)
add_subdirectory(unit) # add_subdirectory(unit)