diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-08-26 08:40:23 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-08-26 08:40:23 +0200 |
| commit | c6c92ec0961f17e6749f8a9f5a1a71ab56b71906 (patch) | |
| tree | 71b8f039d3a5a4388a68dfe43a6fb831e723e967 /src/libs/qmljs/qmljsplugindumper.cpp | |
| parent | c10f23a5c6c7d54e5a9af2c3b729e5a752dc51b6 (diff) | |
| parent | 70343084badaca0ae8a05f2e4c150a893e929275 (diff) | |
Merge remote-tracking branch 'origin/8.0'
Conflicts:
src/libs/qmljs/qmljsmodelmanagerinterface.cpp
src/plugins/clangcodemodel/clangdclient.cpp
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
src/plugins/qmldesigner/designercore/include/modelnode.h
src/plugins/qmldesigner/designercore/model/modelnode.cpp
src/plugins/qmldesigner/designercore/model/rewriterview.cpp
Change-Id: I93c57879b79f27325321bfc045ca618bd835af93
Diffstat (limited to 'src/libs/qmljs/qmljsplugindumper.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsplugindumper.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp index ae5e9c3d7a..383868621a 100644 --- a/src/libs/qmljs/qmljsplugindumper.cpp +++ b/src/libs/qmljs/qmljsplugindumper.cpp @@ -296,7 +296,8 @@ void PluginDumper::qmlPluginTypeDumpDone(QtcProcess *process) QStringList dependencies; }; - auto future = Utils::runAsync([output, libraryPath](QFutureInterface<CppQmlTypesInfo>& future) + auto future = Utils::runAsync(m_modelManager->threadPool(), + [output, libraryPath](QFutureInterface<CppQmlTypesInfo>& future) { CppQmlTypesInfo infos; CppQmlTypesLoader::parseQmlTypeDescriptions(output, &infos.objectsList, &infos.moduleApis, &infos.dependencies, @@ -349,7 +350,7 @@ void PluginDumper::pluginChanged(const QString &pluginLibrary) QFuture<PluginDumper::QmlTypeDescription> PluginDumper::loadQmlTypeDescription(const FilePaths &paths) const { - auto future = Utils::runAsync([=](QFutureInterface<PluginDumper::QmlTypeDescription> &future) + auto future = Utils::runAsync(m_modelManager->threadPool(), [=](QFutureInterface<PluginDumper::QmlTypeDescription> &future) { PluginDumper::QmlTypeDescription result; |