From 358574f44da276193077c5926053b2be9c621a05 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 17 Sep 2019 07:21:52 +0200 Subject: [PATCH] Android: Fix compile for gcc 5.3 Change-Id: Ic70d6507babeb4b782ace7fb62c37485335311e1 Reviewed-by: David Schulz --- src/plugins/android/androidconfigurations.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 6986d56a8f3..87f2d8b60e6 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -738,13 +738,13 @@ FilePath AndroidConfig::ndkLocation() const static inline QString gdbServerArch(const QString &androidAbi) { if (androidAbi == "arm64-v8a") { - return "arm64"; + return QString("arm64"); } else if (androidAbi == "armeabi-v7a") { - return "arm"; + return QString("arm"); } else if (androidAbi == "x86_64") { - return "x86_64"; + return QString("x86_64"); } else if (androidAbi == "x86") { - return "x86"; + return QString("x86"); } else { return {}; }