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

Add error string to IRunControlFactory::createRunControl

Browse Source 
And add a few helpful error messages

Task-number: QTCREATORBUG-7826

Change-Id: Ia9f9fa476cecf2cff198bc460408bc062e119338
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Daniel Teske
2012-09-05 12:42:41 +02:00
committed by Friedemann Kleint
parent c5097ed183
commit 7657dd3a47
25 changed files with 88 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
View File

@@ -167,7 +167,7 @@ bool QmlProjectRunControlFactory::canRun(RunConfiguration *runConfiguration,
}
RunControl *QmlProjectRunControlFactory::create(RunConfiguration *runConfiguration,
RunMode mode)
RunMode mode, QString *errorMessage)
{
QTC_ASSERT(canRun(runConfiguration, mode), return 0);
QmlProjectRunConfiguration *config = qobject_cast<QmlProjectRunConfiguration *>(runConfiguration);
@@ -187,7 +187,7 @@ RunControl *QmlProjectRunControlFactory::create(RunConfiguration *runConfigurati
if (mode == NormalRunMode)
runControl = new QmlProjectRunControl(config, mode);
else if (mode == DebugRunMode)
runControl = createDebugRunControl(config);
runControl = createDebugRunControl(config, errorMessage);
return runControl;
}
@@ -196,7 +196,7 @@ QString QmlProjectRunControlFactory::displayName() const
return tr("Run");
}
RunControl *QmlProjectRunControlFactory::createDebugRunControl(QmlProjectRunConfiguration *runConfig)
RunControl *QmlProjectRunControlFactory::createDebugRunControl(QmlProjectRunConfiguration *runConfig, QString *errorMessage)
{
Debugger::DebuggerStartParameters params;
params.startMode = Debugger::StartInternal;
@@ -224,10 +224,11 @@ RunControl *QmlProjectRunControlFactory::createDebugRunControl(QmlProjectRunConf
if (params.executable.isEmpty()) {
QmlProjectPlugin::showQmlObserverToolWarning();
*errorMessage = QString(""); // hack, we already showed a error message
return 0;
}
return Debugger::DebuggerPlugin::createDebugger(params, runConfig);
return Debugger::DebuggerPlugin::createDebugger(params, runConfig, errorMessage);
}
} // namespace Internal