forked from qt-creator/qt-creator
QMakeStep: Show error output if qmlsdebuggerlib build fails
Reviewed-by: dt
This commit is contained in:
@@ -42,6 +42,7 @@
|
|||||||
#include "qt4target.h"
|
#include "qt4target.h"
|
||||||
#include "qtversionmanager.h"
|
#include "qtversionmanager.h"
|
||||||
#include "debugginghelperbuildtask.h"
|
#include "debugginghelperbuildtask.h"
|
||||||
|
#include "ui_showbuildlog.h"
|
||||||
|
|
||||||
#include <projectexplorer/buildsteplist.h>
|
#include <projectexplorer/buildsteplist.h>
|
||||||
#include <projectexplorer/toolchain.h>
|
#include <projectexplorer/toolchain.h>
|
||||||
@@ -556,12 +557,27 @@ void QMakeStepConfigWidget::buildQmlDebuggingHelper()
|
|||||||
|
|
||||||
void QMakeStepConfigWidget::debuggingHelperBuildFinished(int qtVersionId, const QString &output)
|
void QMakeStepConfigWidget::debuggingHelperBuildFinished(int qtVersionId, const QString &output)
|
||||||
{
|
{
|
||||||
m_step->qt4BuildConfiguration()->qtVersion()->invalidateCache();
|
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->setChecked(m_step->linkQmlDebuggingLibrary());
|
||||||
m_ui.qmlDebuggingLibraryCheckBox->setEnabled(m_step->isQmlDebuggingLibrarySupported());
|
m_ui.qmlDebuggingLibraryCheckBox->setEnabled(m_step->isQmlDebuggingLibrarySupported());
|
||||||
updateSummaryLabel();
|
updateSummaryLabel();
|
||||||
updateEffectiveQMakeCall();
|
updateEffectiveQMakeCall();
|
||||||
updateQmlDebuggingWarningsLabel();
|
updateQmlDebuggingWarningsLabel();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!version->hasQmlDebuggingLibrary()) {
|
||||||
|
Ui::ShowBuildLog ui;
|
||||||
|
QDialog dialog;
|
||||||
|
ui.setupUi(&dialog);
|
||||||
|
|
||||||
|
ui.log->setPlainText(output);
|
||||||
|
dialog.exec();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void QMakeStepConfigWidget::updateSummaryLabel()
|
void QMakeStepConfigWidget::updateSummaryLabel()
|
||||||
|
Reference in New Issue
Block a user