Merge remote-tracking branch 'origin/3.5'

Change-Id: I58a218472e5d037d01f58029422fe5caab0e3c24

2 files changed, 1 insertions, 3 deletions

diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp
index dced8b03d6..6e1b2bb79a 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp
@@ -152,11 +152,10 @@ bool ClangStaticAnalyzerPlugin::initializeEnterpriseFeatures(const QStringList &
     action->setActionId("ClangStaticAnalyzer");
     action->setWidgetCreator(widgetCreator);
     action->setRunControlCreator(runControlCreator);
-    action->setToolStarter([tool] { tool->startTool(); });
+    action->setCustomToolStarter([tool] { tool->startTool(); });
     action->setText(tr("Clang Static Analyzer"));
     action->setToolTip(toolTip);
     action->setMenuGroup(Constants::G_ANALYZER_TOOLS);
-    action->setStartMode(StartLocal);
     action->setEnabled(false);
     AnalyzerManager::addAction(action);
 
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
index 0b54fa2af3..6531ca39a2 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
@@ -99,7 +99,6 @@ RunControl *ClangStaticAnalyzerRunControlFactory::create(RunConfiguration *runCo
 
     AnalyzerStartParameters sp;
     sp.runMode = runMode;
-    sp.startMode = StartLocal;
     BuildConfiguration * const buildConfiguration = target->activeBuildConfiguration();
     QTC_ASSERT(buildConfiguration, return 0);
     sp.environment = buildConfiguration->environment();