Merge remote-tracking branch 'origin/3.5'

Change-Id: I58a218472e5d037d01f58029422fe5caab0e3c24
This commit is contained in:
Eike Ziller
2015-06-23 08:29:46 +02:00
2 changed files with 1 additions and 3 deletions

View File

@@ -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);

View File

@@ -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();