diff options
author | Eike Ziller <eike.ziller@qt.io> | 2019-03-29 13:48:25 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2019-04-04 10:43:35 +0000 |
commit | fecf863b78016883cfe13ec930a24fd8df37c561 (patch) | |
tree | 3304609ddb8b141b8d63ea0a3a363ec33cfb4866 /src/plugins/coreplugin/shellcommand.cpp | |
parent | d2242babeb4f34187073dbcb051afadd285ad216 (diff) | |
download | qt-creator-fecf863b78016883cfe13ec930a24fd8df37c561.tar.gz |
UpdateInfo: Show info when no updates are found
Show that no updates are found in the progress widget.
Also change the title to something nice and understandable.
Task-number: QTCREATORBUG-21584
Change-Id: I765509850d0454fa3c93b31586766d810ff6e392
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/coreplugin/shellcommand.cpp')
-rw-r--r-- | src/plugins/coreplugin/shellcommand.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/shellcommand.cpp b/src/plugins/coreplugin/shellcommand.cpp index a236c906e4..a1ddd083eb 100644 --- a/src/plugins/coreplugin/shellcommand.cpp +++ b/src/plugins/coreplugin/shellcommand.cpp @@ -40,12 +40,17 @@ ShellCommand::ShellCommand(const QString &workingDirectory, const QProcessEnviro this, &ShellCommand::coreAboutToClose); } +FutureProgress *ShellCommand::futureProgress() const +{ + return m_progress.data(); +} + void ShellCommand::addTask(QFuture<void> &future) { const QString name = displayName(); const auto id = Core::Id::fromString(name + QLatin1String(".action")); if (hasProgressParser()) { - ProgressManager::addTask(future, name, id); + m_progress = ProgressManager::addTask(future, name, id); } else { // add a timed tasked based on timeout // we cannot access the future interface directly, so we need to create a new one @@ -58,7 +63,7 @@ void ShellCommand::addTask(QFuture<void> &future) watcher->deleteLater(); }); watcher->setFuture(future); - ProgressManager::addTimedTask(*fi, name, id, qMax(2, timeoutS() / 5)/*itsmagic*/); + m_progress = ProgressManager::addTimedTask(*fi, name, id, qMax(2, timeoutS() / 5)/*itsmagic*/); } } |