Commit 1b7fc163 authored by Kai Koehne's avatar Kai Koehne
Browse files

QMakeStep: Show error output if qmlsdebuggerlib build fails

Reviewed-by: dt
parent 3bfc953c
......@@ -42,6 +42,7 @@
#include "qt4target.h"
#include "qtversionmanager.h"
#include "debugginghelperbuildtask.h"
#include "ui_showbuildlog.h"
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/toolchain.h>
......@@ -556,12 +557,27 @@ void QMakeStepConfigWidget::buildQmlDebuggingHelper()
void QMakeStepConfigWidget::debuggingHelperBuildFinished(int qtVersionId, const QString &output)
{
m_step->qt4BuildConfiguration()->qtVersion()->invalidateCache();
m_ui.qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary());
m_ui.qmlDebuggingLibraryCheckBox->setEnabled(m_step->isQmlDebuggingLibrarySupported());
updateSummaryLabel();
updateEffectiveQMakeCall();
updateQmlDebuggingWarningsLabel();
QtVersion *version = QtVersionManager::instance()->version(qtVersionId);
if (!version) // qt version got deleted in between
return;
version->invalidateCache();
if (version == m_step->qt4BuildConfiguration()->qtVersion()) {
m_ui.qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary());
m_ui.qmlDebuggingLibraryCheckBox->setEnabled(m_step->isQmlDebuggingLibrarySupported());
updateSummaryLabel();
updateEffectiveQMakeCall();
updateQmlDebuggingWarningsLabel();
}
if (!version->hasQmlDebuggingLibrary()) {
Ui::ShowBuildLog ui;
QDialog dialog;
ui.setupUi(&dialog);
ui.log->setPlainText(output);
dialog.exec();
}
}
void QMakeStepConfigWidget::updateSummaryLabel()
......
Markdown is supported
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