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

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Change-Id: Ia8254720b2ba6e3e7b859017e1c2b6e289bed771
This commit is contained in:
Eike Ziller
2020-03-20 08:16:19 +01:00
parent 5de0e81d8b 7f0b418a22
commit d80f3972a4
26 changed files with 174 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,11 +169,6 @@ AndroidToolChainFactory::AndroidToolChainFactory()
setToolchainConstructor([] { return new AndroidToolChain; });
}
ToolChainList AndroidToolChainFactory::autoDetect(const ToolChainList &alreadyKnown)
{
return autodetectToolChains(alreadyKnown);
}
static FilePath clangPlusPlusPath(const FilePath &clangPath)
{
return clangPath.parentDir().pathAppended(