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

QnxDeployQtLibrariesDialog: Reuse TaskTreeRunner

Browse Source 
Change-Id: Ic64bd6821991ee594e48b4fa325de262a9764784
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2024-01-13 19:06:55 +01:00
parent bd83ea8b8c
commit 02be4ac613
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
View File

@@ -13,6 +13,8 @@
#include <qtsupport/qtversionmanager.h> #include <qtsupport/qtversionmanager.h>
#include <solutions/tasking/tasktreerunner.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/layoutbuilder.h> #include <utils/layoutbuilder.h>
@@ -95,7 +97,7 @@ private:
enum class CheckResult { RemoveDir, SkipRemoveDir, Abort }; enum class CheckResult { RemoveDir, SkipRemoveDir, Abort };
CheckResult m_checkResult = CheckResult::Abort; CheckResult m_checkResult = CheckResult::Abort;
mutable QList<DeployableFile> m_deployableFiles; mutable QList<DeployableFile> m_deployableFiles;
std::unique_ptr<TaskTree> m_taskTree; TaskTreeRunner m_taskTreeRunner;
}; };
QList<DeployableFile> collectFilesToUpload(const DeployableFile &deployable) QList<DeployableFile> collectFilesToUpload(const DeployableFile &deployable)
@@ -241,7 +243,7 @@ Group QnxDeployQtLibrariesDialogPrivate::deployRecipe()
void QnxDeployQtLibrariesDialogPrivate::start() void QnxDeployQtLibrariesDialogPrivate::start()
{ {
QTC_ASSERT(m_device, return); QTC_ASSERT(m_device, return);
QTC_ASSERT(!m_taskTree, return); QTC_ASSERT(!m_taskTreeRunner.isRunning(), return);
if (m_remoteDirectory->text().isEmpty()) { if (m_remoteDirectory->text().isEmpty()) {
QMessageBox::warning(q, q->windowTitle(), QMessageBox::warning(q, q->windowTitle(),
Tr::tr("Please input a remote directory to deploy to.")); Tr::tr("Please input a remote directory to deploy to."));
@@ -260,19 +262,14 @@ void QnxDeployQtLibrariesDialogPrivate::start()
m_deployableFiles = gatherFiles(); m_deployableFiles = gatherFiles();
m_deployProgress->setRange(0, m_deployableFiles.count()); m_deployProgress->setRange(0, m_deployableFiles.count());
m_taskTree.reset(new TaskTree(deployRecipe())); m_taskTreeRunner.start(deployRecipe());
connect(m_taskTree.get(), &TaskTree::done, this, [this] {
m_taskTree.release()->deleteLater();
handleUploadFinished();
});
m_taskTree->start();
} }
void QnxDeployQtLibrariesDialogPrivate::stop() void QnxDeployQtLibrariesDialogPrivate::stop()
{ {
if (!m_taskTree) if (!m_taskTreeRunner.isRunning())
return; return;
m_taskTree.reset(); m_taskTreeRunner.reset();
handleUploadFinished(); handleUploadFinished();
} }
@@ -326,6 +323,8 @@ QnxDeployQtLibrariesDialogPrivate::QnxDeployQtLibrariesDialogPrivate(
this, &QnxDeployQtLibrariesDialogPrivate::start); this, &QnxDeployQtLibrariesDialogPrivate::start);
connect(m_closeButton, &QAbstractButton::clicked, connect(m_closeButton, &QAbstractButton::clicked,
q, &QWidget::close); q, &QWidget::close);
connect(&m_taskTreeRunner, &TaskTreeRunner::done,
this, &QnxDeployQtLibrariesDialogPrivate::handleUploadFinished);
} }
QnxDeployQtLibrariesDialog::~QnxDeployQtLibrariesDialog() QnxDeployQtLibrariesDialog::~QnxDeployQtLibrariesDialog()