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

4
src/plugins/android/androiddebugsupport.cpp
View File

@@ -81,7 +81,7 @@ static QStringList qtSoPaths(QtSupport::BaseQtVersion *qtVersion)
return paths.toList();
}
RunControl *AndroidDebugSupport::createDebugRunControl(AndroidRunConfiguration *runConfig)
RunControl *AndroidDebugSupport::createDebugRunControl(AndroidRunConfiguration *runConfig, QString *errorMessage)
{
Target *target = runConfig->target();
Qt4Project *project = static_cast<Qt4Project *>(target->project());
@@ -119,7 +119,7 @@ RunControl *AndroidDebugSupport::createDebugRunControl(AndroidRunConfiguration *
}
DebuggerRunControl * const debuggerRunControl
= DebuggerPlugin::createDebugger(params, runConfig);
= DebuggerPlugin::createDebugger(params, runConfig, errorMessage);
new AndroidDebugSupport(runConfig, debuggerRunControl);
return debuggerRunControl;
}

3
src/plugins/android/androiddebugsupport.h
View File

@@ -47,7 +47,8 @@ class AndroidDebugSupport : public QObject
Q_OBJECT
public:
static ProjectExplorer::RunControl *createDebugRunControl(AndroidRunConfiguration *runConfig);
static ProjectExplorer::RunControl *createDebugRunControl(AndroidRunConfiguration *runConfig,
QString *errorMessage);
AndroidDebugSupport(AndroidRunConfiguration *runConfig,
Debugger::DebuggerRunControl *runControl);

4
src/plugins/android/androidrunfactories.cpp
View File

@@ -171,7 +171,7 @@ bool AndroidRunControlFactory::canRun(RunConfiguration *runConfiguration,
}
RunControl *AndroidRunControlFactory::create(RunConfiguration *runConfig,
ProjectExplorer::RunMode mode)
ProjectExplorer::RunMode mode, QString *errorMessage)
{
Q_ASSERT(canRun(runConfig, mode));
AndroidRunConfiguration *rc = qobject_cast<AndroidRunConfiguration *>(runConfig);
@@ -179,7 +179,7 @@ RunControl *AndroidRunControlFactory::create(RunConfiguration *runConfig,
if (mode == NormalRunMode)
return new AndroidRunControl(rc);
else
return AndroidDebugSupport::createDebugRunControl(rc);
return AndroidDebugSupport::createDebugRunControl(rc, errorMessage);
}
QString AndroidRunControlFactory::displayName() const

3
src/plugins/android/androidrunfactories.h
View File

@@ -80,7 +80,8 @@ public:
bool canRun(ProjectExplorer::RunConfiguration *runConfiguration,
ProjectExplorer::RunMode mode) const;
ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration,
ProjectExplorer::RunMode mode);
ProjectExplorer::RunMode mode,
QString *errorMessage);
};
} // namespace Internal