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

Android: Rename ANDROID_TOOLCHAIN_ID to ANDROID_TOOLCHAIN_TYPEID

Browse Source 
That's what it is, and it's the only odd one out currently.

Change-Id: If098e2691b9f88fbd5f516cf869e390f43b9ddfa
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
hjk
2019-06-14 11:12:19 +02:00
parent 6796a5edcd
commit 3c92742605
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
View File

@@ -126,11 +126,11 @@ static QStringList toolchainList(const ProjectExplorer::ToolChain *tc)
{
QStringList list;
if (tc->typeId() == ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID
|| (tc->typeId() == Android::Constants::ANDROID_TOOLCHAIN_ID
|| (tc->typeId() == Android::Constants::ANDROID_TOOLCHAIN_TYPEID
&& tc->compilerCommand().toString().contains("clang"))) {
list << QLatin1String("clang") << QLatin1String("llvm") << QLatin1String("gcc");
} else if (tc->typeId() == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID
|| tc->typeId() == Android::Constants::ANDROID_TOOLCHAIN_ID) {
|| tc->typeId() == Android::Constants::ANDROID_TOOLCHAIN_TYPEID) {
list << QLatin1String("gcc"); // TODO: Detect llvm-gcc
} else if (tc->typeId() == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID) {
list << QLatin1String("mingw") << QLatin1String("gcc");