Commit 8c6c7ce3 authored by Kai Koehne's avatar Kai Koehne
Browse files

DebuggingHelper: Update UI even if compilation failed

This fixes all the buttons staying in disabled mode after an (unsuccessful)
compilation. Problem was that in the end, the finished() call informed
the option page that the build was over, while the updateQtVersions()
call updated the UI. The patch fixes the order, but also updates the UI
as reaction to the finished call, because relying on the delivery order of
two independent signals via Qt::QueuedConnection is fragile per se.

Change-Id: Ifdd03e3cb9d9bf96b30053e5e8aa0a3f0232ab1c
Task-number: QTCREATORBUG-5906
Reviewed-on: http://codereview.qt.nokia.com/3485

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarChristiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent b7551b81
...@@ -165,8 +165,8 @@ void DebuggingHelperBuildTask::run(QFutureInterface<void> &future) ...@@ -165,8 +165,8 @@ void DebuggingHelperBuildTask::run(QFutureInterface<void> &future)
log(result, QString()); log(result, QString());
} }
emit updateQtVersions(m_qmakeCommand);
emit finished(m_qtId, m_log, m_tools); emit finished(m_qtId, m_log, m_tools);
emit updateQtVersions(m_qmakeCommand);
deleteLater(); deleteLater();
} }
......
...@@ -293,6 +293,8 @@ void QtOptionsPageWidget::debuggingHelperBuildFinished(int qtVersionId, const QS ...@@ -293,6 +293,8 @@ void QtOptionsPageWidget::debuggingHelperBuildFinished(int qtVersionId, const QS
if (!success) if (!success)
showDebuggingBuildLog(item); showDebuggingBuildLog(item);
updateDebuggingHelperUi();
} }
void QtOptionsPageWidget::cleanUpQtVersions() void QtOptionsPageWidget::cleanUpQtVersions()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment