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

Rename toolchain type constants in ProjectExplorer

Browse Source 
Change-Id: I56f5b7373846bb091456c050eb1ff3495ca2dd72
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-07-07 15:37:50 +02:00
parent e6d1141e1e
commit c275dac084
10 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/ios/iosbuildstep.cpp
View File

@@ -201,8 +201,8 @@ QStringList IosBuildStep::defaultArguments() const
qCWarning(iosLog) << "IosBuildStep had an unknown buildType "
<< target()->activeBuildConfiguration()->buildType();
}
if (tc->typeId() == ProjectExplorer::Constants::GCC_TOOLCHAIN_ID
|| tc->typeId() == ProjectExplorer::Constants::CLANG_TOOLCHAIN_ID) {
if (tc->typeId() == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID
|| tc->typeId() == ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID) {
GccToolChain *gtc = static_cast<GccToolChain *>(tc);
res << gtc->platformCodeGenFlags();
}

6
src/plugins/ios/iosconfigurations.cpp
View File

@@ -100,8 +100,8 @@ void IosConfigurations::updateAutomaticKitList()
foreach (ToolChain *tc, ToolChainManager::toolChains()) {
if (!tc->isAutoDetected()) // use also user toolchains?
continue;
if (tc->typeId() != ProjectExplorer::Constants::CLANG_TOOLCHAIN_ID
&& tc->typeId() != ProjectExplorer::Constants::GCC_TOOLCHAIN_ID)
if (tc->typeId() != ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID
&& tc->typeId() != ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID)
continue;
GccToolChain *toolchain = static_cast<GccToolChain *>(tc);
QMapIterator<QString, Platform> iter(platforms);
@@ -158,7 +158,7 @@ void IosConfigurations::updateAutomaticKitList()
if (p.compilerPath.toFileInfo().baseName().startsWith(QLatin1String("clang")))
toolchain = new ClangToolChain(ToolChain::AutoDetection);
else
toolchain = new GccToolChain(ProjectExplorer::Constants::GCC_TOOLCHAIN_ID,
toolchain = new GccToolChain(ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID,
ToolChain::AutoDetection);
QString baseDisplayName = p.name;
QString displayName = baseDisplayName;