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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/libs/utils/utils-lib.pri
	src/plugins/clangcodemodel/clangbackendipcintegration.h
	src/shared/qbs

Change-Id: I240e89afc76d8f40ce69d66683014b603f714707
This commit is contained in:
Eike Ziller
2017-08-23 12:12:41 +02:00
parent f2d2a6c6ff 7ef365d756
commit ddd9e96afa
70 changed files with 495 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -45,6 +45,7 @@
#include <coreplugin/icore.h>
#include <coreplugin/icontext.h>
#include <coreplugin/icore.h>
#include <QDir>
#include <QPushButton>
@@ -947,10 +948,29 @@ void RunControlPrivate::onWorkerFailed(RunWorker *worker, const QString &msg)
worker->d->state = RunWorkerState::Done;
showError(msg);
if (state == RunControlState::Running || state == RunControlState::Starting)
initiateStop();
else
switch (state) {
case RunControlState::Initialized:
// FIXME 1: We don't have an output pane yet, so use some other mechanism for now.
// FIXME 2: Translation...
QMessageBox::critical(Core::ICore::dialogParent(),
QCoreApplication::translate("TaskHub", "Error"),
QString("Failure during startup. Aborting.") + "<p>" + msg);
continueStopOrFinish();
break;
case RunControlState::Starting:
case RunControlState::Running:
initiateStop();
break;
case RunControlState::Stopping:
case RunControlState::Finishing:
continueStopOrFinish();
break;
case RunControlState::Stopped:
case RunControlState::Finished:
QTC_CHECK(false); // Should not happen.
continueStopOrFinish();
break;
}
}
void RunControlPrivate::onWorkerStopped(RunWorker *worker)