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

Android 64bit toolchains

Browse Source 
Change-Id: Ia2b57013b392237434ea3649c4f60a671e84ceb5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2014-11-18 18:37:05 +01:00
parent e1c426f2bc
commit cb48e4854a
7 changed files with 142 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,7 @@ protected:
QList<ProjectExplorer::Abi> detectSupportedAbis() const;
private:
explicit AndroidToolChain(ProjectExplorer::Abi::Architecture arch, const QString &ndkToolChainVersion, Detection d);
explicit AndroidToolChain(const ProjectExplorer::Abi &abi, const QString &ndkToolChainVersion, Detection d);
AndroidToolChain();
AndroidToolChain(const AndroidToolChain &);
@@ -110,7 +110,7 @@ public:
{
public:
Utils::FileName compilerCommand;
ProjectExplorer::Abi::Architecture architecture;
ProjectExplorer::Abi abi;
QString version;
};
@@ -120,9 +120,9 @@ public:
static QList<int> versionNumberFromString(const QString &version);
static bool versionCompareLess(const QList<int> &a, const QList<int> &b);
static bool versionCompareLess(AndroidToolChain *atc, AndroidToolChain *btc);
static QList<int> newestToolChainVersionForArch(ProjectExplorer::Abi::Architecture arch);
static QList<int> newestToolChainVersionForArch(const ProjectExplorer::Abi &abi);
private:
static QMap<ProjectExplorer::Abi::Architecture, QList<int> > m_newestVersionForArch;
static QHash<ProjectExplorer::Abi, QList<int> > m_newestVersionForAbi;
static Utils::FileName m_ndkLocation;
};