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

Android: Fix compile with Qt5.6 and gcc4.9

Browse Source 
Change-Id: Id353723112bb3086e695f483c3ce4ec53ba425d8
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Christian Stenger
2017-11-22 12:51:36 +01:00
parent 0a202e4c29
commit c738198185
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,16 +95,16 @@ AndroidToolChain::~AndroidToolChain()
static QString getArch(const QString &triple) static QString getArch(const QString &triple)
{ {
if (triple.indexOf("x86_64") == 0) if (triple.indexOf("x86_64") == 0)
return "x86_64"; return QString::fromUtf8("x86_64");
if (triple.indexOf("i686") == 0) if (triple.indexOf("i686") == 0)
return "x86"; return QString::fromUtf8("x86");
if (triple.indexOf("mips64") == 0) if (triple.indexOf("mips64") == 0)
return "mips64"; return QString::fromUtf8("mips64");
if (triple.indexOf("mips") == 0) if (triple.indexOf("mips") == 0)
return "mips"; return QString::fromUtf8("mips");
if (triple.indexOf("aarch64") == 0) if (triple.indexOf("aarch64") == 0)
return "arm64-v8a"; return QString::fromUtf8("arm64-v8a");
return "armeabi-v7a"; return QString::fromUtf8("armeabi-v7a");
} }
// Paths added here are those that were used by qmake. They were taken from // Paths added here are those that were used by qmake. They were taken from