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

ProjectExplorer: Remove ClangToolChain as class of its own

Browse Source 
Change-Id: I92109855503d8696666a17f6e992bd5ca20cbf68
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2023-09-04 18:22:12 +02:00
parent c4c76c8642
commit b68bdbafce
5 changed files with 24 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidtoolchain.cpp
View File

@@ -47,7 +47,7 @@ static ToolChain *findToolChain(FilePath &compilerPath, Id lang, const QString &
}
AndroidToolChain::AndroidToolChain()
: ClangToolChain(Constants::ANDROID_TOOLCHAIN_TYPEID)
: GccToolChain(Constants::ANDROID_TOOLCHAIN_TYPEID, Clang)
{
setTypeDisplayName(Tr::tr("Android Clang"));
}
@@ -80,7 +80,7 @@ bool AndroidToolChain::isValid() const
const bool isChildofSdk = compilerCommand().isChildOf(
AndroidConfigurations::currentConfig().sdkLocation());
return ClangToolChain::isValid() && typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID
return GccToolChain::isValid() && typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID
&& targetAbi().isValid() && (isChildofNdk || isChildofSdk)
&& !originalTargetTriple().isEmpty();
}
@@ -103,7 +103,7 @@ void AndroidToolChain::addToEnvironment(Environment &env) const
void AndroidToolChain::fromMap(const Store &data)
{
ClangToolChain::fromMap(data);
GccToolChain::fromMap(data);
if (hasError())
return;
if (!isValid())