diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-08-24 12:15:58 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2011-08-24 16:11:05 +0200 |
| commit | 8c6c7ce32f4f07ccad4c9a15c2e273832c8cf1b4 (patch) | |
| tree | d487e0e25dbfbf586acd3377857ab45f9c96b3b9 | |
| parent | b7551b81166cdc6ae1ce629183e827d8e088052b (diff) | |
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: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
| -rw-r--r-- | src/plugins/qtsupport/debugginghelperbuildtask.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qtsupport/qtoptionspage.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qtsupport/debugginghelperbuildtask.cpp b/src/plugins/qtsupport/debugginghelperbuildtask.cpp index e59e31937db..32ae5bb97d0 100644 --- a/src/plugins/qtsupport/debugginghelperbuildtask.cpp +++ b/src/plugins/qtsupport/debugginghelperbuildtask.cpp @@ -165,8 +165,8 @@ void DebuggingHelperBuildTask::run(QFutureInterface<void> &future) log(result, QString()); } - emit updateQtVersions(m_qmakeCommand); emit finished(m_qtId, m_log, m_tools); + emit updateQtVersions(m_qmakeCommand); deleteLater(); } diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index f8e829a2e08..3781467dc68 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -293,6 +293,8 @@ void QtOptionsPageWidget::debuggingHelperBuildFinished(int qtVersionId, const QS if (!success) showDebuggingBuildLog(item); + + updateDebuggingHelperUi(); } void QtOptionsPageWidget::cleanUpQtVersions() |