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: Ic70d6507babeb4b782ace7fb62c37485335311e1
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2019-09-17 07:21:52 +02:00
parent cbfd7c4bf8
commit 358574f44d
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/androidconfigurations.cpp
View File

@@ -738,13 +738,13 @@ FilePath AndroidConfig::ndkLocation() const
static inline QString gdbServerArch(const QString &androidAbi) static inline QString gdbServerArch(const QString &androidAbi)
{ {
if (androidAbi == "arm64-v8a") { if (androidAbi == "arm64-v8a") {
return "arm64"; return QString("arm64");
} else if (androidAbi == "armeabi-v7a") { } else if (androidAbi == "armeabi-v7a") {
return "arm"; return QString("arm");
} else if (androidAbi == "x86_64") { } else if (androidAbi == "x86_64") {
return "x86_64"; return QString("x86_64");
} else if (androidAbi == "x86") { } else if (androidAbi == "x86") {
return "x86"; return QString("x86");
} else { } else {
return {}; return {};
} }