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

Android: Fix compile for gcc 5.3

Browse Source 
Change-Id: I535b5873390910ca2a9963c70ed2912820c1df0e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Christian Stenger
2020-01-21 06:57:40 +01:00
parent 12c74e6664
commit 4979b5286e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidmanager.cpp
View File

@@ -269,13 +269,13 @@ QStringList AndroidManager::applicationAbis(const Target *target)
QString AndroidManager::archTriplet(const QString &abi) QString AndroidManager::archTriplet(const QString &abi)
{ {
if (abi == "x86") { if (abi == "x86") {
return "i686-linux-android"; return {"i686-linux-android"};
} else if (abi == "x86_64") { } else if (abi == "x86_64") {
return "x86_64-linux-android"; return {"x86_64-linux-android"};
} else if (abi == "arm64-v8a") { } else if (abi == "arm64-v8a") {
return "aarch64-linux-android"; return {"aarch64-linux-android"};
} }
return "arm-linux-androideabi"; return {"arm-linux-androideabi"};
} }
QJsonObject AndroidManager::deploymentSettings(const Target *target) QJsonObject AndroidManager::deploymentSettings(const Target *target)