From bd24bf740c08352b311c27864cc2028d0d0ab80a Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Fri, 24 Apr 2020 13:59:21 +0200 Subject: [PATCH] CMake: Fix wrong arm64 architecture Due to the wrong string comparison, we were writing out the wrong architecture for the arm64 builds to the deployment settings json file. This leads to androiddeployqt tool not being able to locate the stdlibc++. Change-Id: I3d13b14c27f043445bf46aaca0e9f862f6ca84e5 Reviewed-by: Alexandru Croitor --- cmake/QtPlatformAndroid.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake index 4b5bf6ff13..24360cec67 100644 --- a/cmake/QtPlatformAndroid.cmake +++ b/cmake/QtPlatformAndroid.cmake @@ -217,7 +217,7 @@ function(qt_android_generate_deployment_settings target) set(arch_value "i686-linux-android") elseif (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86_64") set(arch_value "x86_64-linux-android") - elseif (CMAKE_ANDROID_ARCH_ABI STREQUAL "armv64-v8a") + elseif (CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a") set(arch_value "aarch64-linux-android") else() set(arch_value "arm-linux-androideabi")