From 0266f44a2a073dd0eaa7a353b662003543b1049d Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Tue, 29 Jul 2014 18:03:18 +0200 Subject: [PATCH] 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 --- src/plugins/debugger/debuggerrunner.cpp | 2 -- src/plugins/projectexplorer/localapplicationruncontrol.cpp | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index b7159555245..6d29ec77186 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(); 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 d0a78621d13..e5072117ff8 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(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); }