diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2020-01-21 06:57:40 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2020-01-21 06:36:55 +0000 |
| commit | 4979b5286e1bcc85c18b2ce22d98d2858ebafebb (patch) | |
| tree | 372072eeb8861fe946186af87e12c11efb16d553 | |
| parent | 12c74e6664bc910b40de7fb96a163d511711b7b1 (diff) | |
| download | qt-creator-4979b5286e1bcc85c18b2ce22d98d2858ebafebb.tar.gz | |
Android: Fix compile for gcc 5.3
Change-Id: I535b5873390910ca2a9963c70ed2912820c1df0e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 29c4f4e6eb..5a98a39c12 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -269,13 +269,13 @@ QStringList AndroidManager::applicationAbis(const Target *target) QString AndroidManager::archTriplet(const QString &abi) { if (abi == "x86") { - return "i686-linux-android"; + return {"i686-linux-android"}; } else if (abi == "x86_64") { - return "x86_64-linux-android"; + return {"x86_64-linux-android"}; } 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) |