forked from qt-creator/qt-creator
Don't ask the user if a buildstep reported non success
Change-Id: I636d24eaadbf93df8dac1cf362d1d753c9660fa6 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
committed by
Eike Ziller
parent
1df87ae0e4
commit
014154e167
@@ -1557,19 +1557,17 @@ void ProjectExplorerPlugin::buildQueueFinished(bool success)
|
|||||||
|
|
||||||
updateActions();
|
updateActions();
|
||||||
|
|
||||||
bool ignoreErrors = true;
|
bool ignoreErrors = false;
|
||||||
if (d->m_delayedRunConfiguration) {
|
if (d->m_delayedRunConfiguration && success && d->m_buildManager->getErrorTaskCount() > 0) {
|
||||||
if (d->m_buildManager->getErrorTaskCount() > 0) {
|
ignoreErrors = QMessageBox::question(Core::ICore::instance()->mainWindow(),
|
||||||
ignoreErrors = QMessageBox::question(Core::ICore::instance()->mainWindow(),
|
tr("Ignore all errors?"),
|
||||||
tr("Ignore all errors?"),
|
tr("Found some build errors in current task.\n"
|
||||||
tr("Found some build errors in current task.\n"
|
"Do you want to ignore them?"),
|
||||||
"Do you want to ignore them?"),
|
QMessageBox::Yes | QMessageBox::No,
|
||||||
QMessageBox::Yes | QMessageBox::No,
|
QMessageBox::No) == QMessageBox::Yes;
|
||||||
QMessageBox::No) == QMessageBox::Yes;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (success && ignoreErrors && d->m_delayedRunConfiguration) {
|
if ((success || ignoreErrors) && d->m_delayedRunConfiguration) {
|
||||||
executeRunConfiguration(d->m_delayedRunConfiguration, d->m_runMode);
|
executeRunConfiguration(d->m_delayedRunConfiguration, d->m_runMode);
|
||||||
} else {
|
} else {
|
||||||
if (d->m_buildManager->tasksAvailable())
|
if (d->m_buildManager->tasksAvailable())
|
||||||
|
|||||||
Reference in New Issue
Block a user