From 4979b5286e1bcc85c18b2ce22d98d2858ebafebb Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 21 Jan 2020 06:57:40 +0100 Subject: [PATCH] Android: Fix compile for gcc 5.3 Change-Id: I535b5873390910ca2a9963c70ed2912820c1df0e Reviewed-by: Orgad Shaneh --- src/plugins/android/androidmanager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 29c4f4e6eba..5a98a39c128 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)