From c7381981857e4c9e02b5a12f4fbbc78a082274cc Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 22 Nov 2017 12:51:36 +0100 Subject: [PATCH] Android: Fix compile with Qt5.6 and gcc4.9 Change-Id: Id353723112bb3086e695f483c3ce4ec53ba425d8 Reviewed-by: Ivan Donchevskii Reviewed-by: Christian Stenger Reviewed-by: Orgad Shaneh --- src/plugins/android/androidtoolchain.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index 477d0004812..a2aa988d47a 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -95,16 +95,16 @@ AndroidToolChain::~AndroidToolChain() static QString getArch(const QString &triple) { if (triple.indexOf("x86_64") == 0) - return "x86_64"; + return QString::fromUtf8("x86_64"); if (triple.indexOf("i686") == 0) - return "x86"; + return QString::fromUtf8("x86"); if (triple.indexOf("mips64") == 0) - return "mips64"; + return QString::fromUtf8("mips64"); if (triple.indexOf("mips") == 0) - return "mips"; + return QString::fromUtf8("mips"); if (triple.indexOf("aarch64") == 0) - return "arm64-v8a"; - return "armeabi-v7a"; + return QString::fromUtf8("arm64-v8a"); + return QString::fromUtf8("armeabi-v7a"); } // Paths added here are those that were used by qmake. They were taken from