feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QMakeStep: Show error output if qmlsdebuggerlib build fails

Browse Source 
Reviewed-by: dt
This commit is contained in:
Kai Koehne
2011-04-07 12:46:10 +02:00
parent 3bfc953c13
commit 1b7fc163fe
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qt4projectmanager/qmakestep.cpp
View File

@@ -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,7 +557,12 @@ void QMakeStepConfigWidget::buildQmlDebuggingHelper()
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->setEnabled(m_step->isQmlDebuggingLibrarySupported());
updateSummaryLabel();
@@ -564,6 +570,16 @@ void QMakeStepConfigWidget::debuggingHelperBuildFinished(int qtVersionId, const
updateQmlDebuggingWarningsLabel();
}
if (!version->hasQmlDebuggingLibrary()) {
Ui::ShowBuildLog ui;
QDialog dialog;
ui.setupUi(&dialog);
ui.log->setPlainText(output);
dialog.exec();
}
}
void QMakeStepConfigWidget::updateSummaryLabel()
{
Qt4BuildConfiguration *qt4bc = m_step->qt4BuildConfiguration();