Commit 68a6ce2a authored by hjk's avatar hjk
Browse files

Android: Minor API fixes in AndroidToolChain



Change-Id: I818ba7d95c52b87a84de6bfdaac8436258ac249a
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 7d5eebb8
......@@ -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) {
......
......@@ -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;
}
......
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment