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

Android: Minor API fixes in AndroidToolChain

Browse Source 
Change-Id: I818ba7d95c52b87a84de6bfdaac8436258ac249a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
hjk
2013-10-11 11:29:06 +02:00
parent 7d5eebb846
commit 68a6ce2a1b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidconfigurations.cpp
View File

@@ -807,7 +807,7 @@ void AndroidConfigurations::updateAutomaticKitList()
// register new kits
QList<Kit *> newKits;
foreach (AndroidToolChain *tc, toolchains) {
if (tc->secondaryToolChain())
if (tc->isSecondaryToolChain())
continue;
QList<QtSupport::BaseQtVersion *> qtVersions = qtVersionsForArch.value(tc->targetAbi().architecture());
foreach (QtSupport::BaseQtVersion *qt, qtVersions) {

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

@@ -229,12 +229,12 @@ QString AndroidToolChain::makeCommand(const Utils::Environment &env) const
return tmp.isEmpty() ? make : tmp;
}
QString AndroidToolChain::ndkToolChainVersion()
QString AndroidToolChain::ndkToolChainVersion() const
{
return m_ndkToolChainVersion;
}
bool AndroidToolChain::secondaryToolChain() const
bool AndroidToolChain::isSecondaryToolChain() const
{
return m_secondaryToolChain;
}

4
src/plugins/android/androidtoolchain.h
View File

@@ -59,9 +59,9 @@ public:
QList<Utils::FileName> suggestedMkspecList() const;
QString makeCommand(const Utils::Environment &environment) const;
QString ndkToolChainVersion();
QString ndkToolChainVersion() const;
bool secondaryToolChain() const;
bool isSecondaryToolChain() const;
void setSecondaryToolChain(bool b);
protected: