feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Adapt to removal of ToolChain::type()

Browse Source 
QtC change: e6d1141e1e

Change-Id: I50c0861dc6a864e54170b21de94a4106921e5a71
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-07-07 15:24:47 +02:00
parent d8a176cae7
commit 7bdf007c86
5 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/clangstaticanalyzer/clangstaticanalyzerutils.cpp
View File

@@ -21,6 +21,8 @@
#include "clangstaticanalyzerdiagnostic.h"
#include "clangstaticanalyzersettings.h"
#include <projectexplorer/projectexplorerconstants.h>
#include <utils/environment.h>
#include <QCoreApplication>
@@ -38,10 +40,10 @@ static bool isFileExecutable(const QString &executablePath)
namespace ClangStaticAnalyzer {
namespace Internal {
QString clangExecutableFromSettings(const QString &toolchainType, bool *isValid)
QString clangExecutableFromSettings(Core::Id toolchainType, bool *isValid)
{
QString exeFromSettings = ClangStaticAnalyzerSettings::instance()->clangExecutable();
if (toolchainType == QLatin1String("msvc"))
if (toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_ID)
exeFromSettings.replace(QLatin1String("clang.exe"), QLatin1String("clang-cl.exe"));
return clangExecutable(exeFromSettings, isValid);
}