Commit d1539ebb authored by con's avatar con
Browse files

Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline

parents 5b02bf94 141f53cf
......@@ -237,6 +237,15 @@ void DebuggerRunControl::setCustomEnvironment(Utils::Environment env)
void DebuggerRunControl::start()
{
QTC_ASSERT(d->m_engine, return);
// User canceled input dialog asking for executable when working on library project.
if (d->m_engine->startParameters().startMode == StartInternal
&& d->m_engine->startParameters().executable.isEmpty()) {
appendMessage(tr("No executable specified.\n"), ErrorMessageFormat);
emit started();
emit finished();
return;
}
debuggerCore()->runControlStarted(d->m_engine);
// We might get a synchronous startFailed() notification on Windows,
......
......@@ -103,11 +103,15 @@ LocalApplicationRunControl::~LocalApplicationRunControl()
void LocalApplicationRunControl::start()
{
m_applicationLauncher.start(m_runMode, m_executable, m_commandLineArguments);
emit started();
QString msg = tr("Starting %1...\n").arg(QDir::toNativeSeparators(m_executable));
appendMessage(msg, NormalMessageFormat);
if (m_executable.isEmpty()) {
appendMessage(tr("No executable specified.\n"), ErrorMessageFormat);
emit finished();
} else {
m_applicationLauncher.start(m_runMode, m_executable, m_commandLineArguments);
QString msg = tr("Starting %1...\n").arg(QDir::toNativeSeparators(m_executable));
appendMessage(msg, NormalMessageFormat);
}
}
LocalApplicationRunControl::StopResult LocalApplicationRunControl::stop()
......
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