Merge remote-tracking branch 'origin/3.2'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidglobal.h

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c

1 files changed, 2 insertions, 8 deletions

diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index d9428a426c..70aa7c4e9b 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();
@@ -454,14 +452,10 @@ IRunConfigurationAspect *DebuggerRunControlFactory::createRunConfigurationAspect
     return new DebuggerRunConfigurationAspect(rc);
 }
 
-DebuggerRunControl *DebuggerRunControlFactory::createAndScheduleRun
-    (const DebuggerStartParameters &sp, RunConfiguration *runConfiguration)
+DebuggerRunControl *DebuggerRunControlFactory::createAndScheduleRun(const DebuggerStartParameters &sp)
 {
     QString errorMessage;
-    if (runConfiguration && !runConfiguration->ensureConfigured(&errorMessage))
-        ProjectExplorer::ProjectExplorerPlugin::showRunErrorMessage(errorMessage);
-
-    DebuggerRunControl *rc = doCreate(sp, runConfiguration, &errorMessage);
+    DebuggerRunControl *rc = doCreate(sp, 0, &errorMessage);
     if (!rc) {
         ProjectExplorer::ProjectExplorerPlugin::showRunErrorMessage(errorMessage);
         return 0;