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

Adapt to rename of ProjectExplorer constants

Browse Source 
QtC change: https://codereview.qt-project.org/#/c/120930/

Change-Id: I5af573d58f13dfc50e9dd003cb652d785e8c8347
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-07-07 15:37:10 +02:00
parent 7bdf007c86
commit 7332cf28ff
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
View File

@@ -144,14 +144,14 @@ public:
// will break if code actually requires stuff from there, but that should be the less common // will break if code actually requires stuff from there, but that should be the less common
// case. // case.
const Core::Id type = projectPart->toolchainType; const Core::Id type = projectPart->toolchainType;
if (type == ProjectExplorer::Constants::MINGW_TOOLCHAIN_ID if (type == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID
|| type == ProjectExplorer::Constants::GCC_TOOLCHAIN_ID) || type == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID)
optionsBuilder.addDefine("#define _X86INTRIN_H_INCLUDED\n"); optionsBuilder.addDefine("#define _X86INTRIN_H_INCLUDED\n");
optionsBuilder.addToolchainAndProjectDefines(); optionsBuilder.addToolchainAndProjectDefines();
optionsBuilder.addHeaderPathOptions(); optionsBuilder.addHeaderPathOptions();
if (type == ProjectExplorer::Constants::MSVC_TOOLCHAIN_ID) if (type == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID)
optionsBuilder.add(QLatin1String("/EHsc")); // clang-cl does not understand exceptions optionsBuilder.add(QLatin1String("/EHsc")); // clang-cl does not understand exceptions
else else
optionsBuilder.add(QLatin1String("-fPIC")); // TODO: Remove? optionsBuilder.add(QLatin1String("-fPIC")); // TODO: Remove?
@@ -164,7 +164,7 @@ public:
private: private:
ClangStaticAnalyzerOptionsBuilder(const CppTools::ProjectPart::Ptr &projectPart) ClangStaticAnalyzerOptionsBuilder(const CppTools::ProjectPart::Ptr &projectPart)
: CompilerOptionsBuilder(projectPart) : CompilerOptionsBuilder(projectPart)
, m_isMsvcToolchain(m_projectPart->toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_ID) , m_isMsvcToolchain(m_projectPart->toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID)
{ {
} }

8
plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
View File

@@ -63,10 +63,10 @@ bool ClangStaticAnalyzerRunControlFactory::canRun(RunConfiguration *runConfigura
Kit *kit = target->kit(); Kit *kit = target->kit();
QTC_ASSERT(kit, return false); QTC_ASSERT(kit, return false);
ToolChain *toolChain = ToolChainKitInformation::toolChain(kit); ToolChain *toolChain = ToolChainKitInformation::toolChain(kit);
return toolChain && (toolChain->typeId() == ProjectExplorer::Constants::CLANG_TOOLCHAIN_ID return toolChain && (toolChain->typeId() == ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID
|| toolChain->typeId() == ProjectExplorer::Constants::GCC_TOOLCHAIN_ID || toolChain->typeId() == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID
|| toolChain->typeId() == ProjectExplorer::Constants::MINGW_TOOLCHAIN_ID || toolChain->typeId() == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID
|| toolChain->typeId() == ProjectExplorer::Constants::MSVC_TOOLCHAIN_ID); || toolChain->typeId() == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID);
} }
RunControl *ClangStaticAnalyzerRunControlFactory::create(RunConfiguration *runConfiguration, RunControl *ClangStaticAnalyzerRunControlFactory::create(RunConfiguration *runConfiguration,

2
plugins/clangstaticanalyzer/clangstaticanalyzerutils.cpp
View File

@@ -43,7 +43,7 @@ namespace Internal {
QString clangExecutableFromSettings(Core::Id toolchainType, bool *isValid) QString clangExecutableFromSettings(Core::Id toolchainType, bool *isValid)
{ {
QString exeFromSettings = ClangStaticAnalyzerSettings::instance()->clangExecutable(); QString exeFromSettings = ClangStaticAnalyzerSettings::instance()->clangExecutable();
if (toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_ID) if (toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID)
exeFromSettings.replace(QLatin1String("clang.exe"), QLatin1String("clang-cl.exe")); exeFromSettings.replace(QLatin1String("clang.exe"), QLatin1String("clang-cl.exe"));
return clangExecutable(exeFromSettings, isValid); return clangExecutable(exeFromSettings, isValid);
} }