aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2014-07-29 18:03:18 +0200
committerDaniel Teske <daniel.teske@digia.com>2014-07-31 12:11:01 +0200
commit0266f44a2a073dd0eaa7a353b662003543b1049d (patch)
treefcc9d502d5fb6755baf31f18dc4ec12caf92f23f
parentb20b1d3378b55f2b4f48c5d3ef04deb4dac863fc (diff)
RunControlFactories: No need to check for isConfigured
Checking if a runconfiguration is configured happens before searching for the right factory, thus the factory can assume that it always gets a configured runconfiguration. Change-Id: I171318dda22c4e89f3619418336865cb28a3dc5f Reviewed-by: hjk <hjk121@nokiamail.com>
-rw-r--r--src/plugins/debugger/debuggerrunner.cpp2
-rw-r--r--src/plugins/projectexplorer/localapplicationruncontrol.cpp4
2 files changed, 1 insertions, 5 deletions
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index b715955524..6d29ec7718 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -310,8 +310,6 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu
QTC_ASSERT(rc, return sp);
EnvironmentAspect *environment = rc->extraAspect<ProjectExplorer::EnvironmentAspect>();
QTC_ASSERT(environment, return sp);
- if (!rc->ensureConfigured(errorMessage))
- return sp;
Target *target = runConfiguration->target();
Kit *kit = target ? target->kit() : KitManager::defaultKit();
diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.cpp b/src/plugins/projectexplorer/localapplicationruncontrol.cpp
index d0a78621d1..e5072117ff 100644
--- a/src/plugins/projectexplorer/localapplicationruncontrol.cpp
+++ b/src/plugins/projectexplorer/localapplicationruncontrol.cpp
@@ -54,11 +54,9 @@ bool LocalApplicationRunControlFactory::canRun(RunConfiguration *runConfiguratio
RunControl *LocalApplicationRunControlFactory::create(RunConfiguration *runConfiguration, RunMode mode, QString *errorMessage)
{
+ Q_UNUSED(errorMessage)
QTC_ASSERT(canRun(runConfiguration, mode), return 0);
LocalApplicationRunConfiguration *localRunConfiguration = qobject_cast<LocalApplicationRunConfiguration *>(runConfiguration);
- // Force the dialog about executables at this point and fail if there is none
- if (!localRunConfiguration->ensureConfigured(errorMessage))
- return 0;
return new LocalApplicationRunControl(localRunConfiguration, mode);
}