diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2019-09-17 07:21:52 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2019-09-17 05:28:31 +0000 |
| commit | 358574f44da276193077c5926053b2be9c621a05 (patch) | |
| tree | d4483690883556ba4382d3d8e0fcc8b274069911 /src/plugins/android | |
| parent | cbfd7c4bf8f1e4e22b2933b9b727ab67a30400fe (diff) | |
| download | qt-creator-358574f44da276193077c5926053b2be9c621a05.tar.gz | |
Android: Fix compile for gcc 5.3
Change-Id: Ic70d6507babeb4b782ace7fb62c37485335311e1
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/android')
| -rw-r--r-- | src/plugins/android/androidconfigurations.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 6986d56a8f..87f2d8b60e 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 {}; } |