diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2023-03-09 17:43:08 +0100 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2023-03-14 08:47:39 +0000 |
commit | 8709ab5ee5fa7df945d677f36d22cf2471517965 (patch) | |
tree | 548f28591ef593953b281fe599490d349cb90c4e /src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp | |
parent | 0bec769b69c660abec9ed0cc333522e4d4b0fc55 (diff) | |
download | qt-creator-8709ab5ee5fa7df945d677f36d22cf2471517965.tar.gz |
QmlJSEditor/QmlDesigner: Use QtConcurrent invocation for async run
Change-Id: Ic3ad1bb4e2d473f6d5134d7e1eebef020bffee0d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp')
-rw-r--r-- | src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp index e1b95b7506..5cfb1414ed 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp @@ -10,11 +10,12 @@ #include "rewriterview.h" #include "qmlitemnode.h" #include "qmlobjectnode.h" -#include "coreplugin/editormanager/editormanager.h" -#include "utils/qtcassert.h" -#include "utils/runextensions.h" -#include "projectexplorer/projectmanager.h" -#include "projectexplorer/project.h" + +#include <coreplugin/editormanager/editormanager.h> +#include <projectexplorer/project.h> +#include <projectexplorer/projectmanager.h> +#include <utils/asynctask.h> +#include <utils/qtcassert.h> #include <auxiliarydataproperties.h> @@ -69,7 +70,7 @@ public: private: void addAsset(const QPixmap &p, const Utils::FilePath &path); - void doDumping(QFutureInterface<void> &fi); + void doDumping(QPromise<void> &promise); void savePixmap(const QPixmap &p, Utils::FilePath &path) const; QFuture<void> m_dumpFuture; @@ -452,7 +453,7 @@ QDebug operator<<(QDebug os, const AssetExporter::ParsingState &s) AssetDumper::AssetDumper(): m_quitDumper(false) { - m_dumpFuture = Utils::runAsync(&AssetDumper::doDumping, this); + m_dumpFuture = Utils::asyncRun(&AssetDumper::doDumping, this); } AssetDumper::~AssetDumper() @@ -489,7 +490,7 @@ void AssetDumper::addAsset(const QPixmap &p, const Utils::FilePath &path) m_assets.push({p, path}); } -void AssetDumper::doDumping(QFutureInterface<void> &fi) +void AssetDumper::doDumping(QPromise<void> &promise) { auto haveAsset = [this] (std::pair<QPixmap, Utils::FilePath> *asset) { QMutexLocker locker(&m_queueMutex); @@ -503,7 +504,7 @@ void AssetDumper::doDumping(QFutureInterface<void> &fi) forever { std::pair<QPixmap, Utils::FilePath> asset; if (haveAsset(&asset)) { - if (fi.isCanceled()) + if (promise.isCanceled()) break; savePixmap(asset.first, asset.second); } else { @@ -513,10 +514,9 @@ void AssetDumper::doDumping(QFutureInterface<void> &fi) m_queueCondition.wait(&m_queueMutex); } - if (fi.isCanceled()) + if (promise.isCanceled()) break; } - fi.reportFinished(); } void AssetDumper::savePixmap(const QPixmap &p, Utils::FilePath &path) const |