Update for NDK r21b, Qt 5.15.1, and Android API 29

3 files changed, 29 insertions, 29 deletions

diff --git a/README.md b/README.md
index 0589dc7..26d5d20 100644
--- a/README.md
+++ b/README.md
@@ -19,9 +19,9 @@ $ qmake ../kelakon/kelakon.pro -spec linux-g++ CONFIG+='debug qml_debug'
 or
 
 ```sh
-$ mkdir build-kelakon-Android_for_armeabi_v7a_arm64_v8a_x86_x86_64_Clang_Qt_5_14_2_for_Android-Debug
-$ cd build-kelakon-Android_for_armeabi_v7a_arm64_v8a_x86_x86_64_Clang_Qt_5_14_2_for_Android-Debug
-$ /opt/Qt5.14.2/5.14.2/android/bin/qmake ../kelakon/kelakon.pro -spec android-clang CONFIG+='debug qml_debug' ANDROID_ABIS="armeabi-v7a arm64-v8a x86 x86_64" 
+$ mkdir build-kelakon-Android_Qt_5_15_1_Clang_Multi_Abi-Debug
+$ cd build-kelakon-Android_Qt_5_15_1_Clang_Multi_Abi-Debug
+$ /opt/Qt/5.15.1/android/bin/qmake ../kelakon/kelakon.pro -spec android-clang CONFIG+='debug qml_debug' ANDROID_ABIS="armeabi-v7a arm64-v8a x86 x86_64" 
 ```
 or so on.
 
@@ -36,7 +36,7 @@ and if for Android:
 ```sh
 $ make install INSTALL_ROOT=android-build
 $ export ANDROID_SDK_ROOT=/opt/android-sdk-update-manager
-$ /opt/Qt5.14.2/5.14.2/android/bin/androiddeployqt --input android-kelakon-deployment-settings.json --output android-build --android-platform android-24
+$ /opt/Qt/5.15.1/android/bin/androiddeployqt --input android-kelakon-deployment-settings.json --output android-build --android-platform android-29
 ```
 
 and if on FreeBSD:
diff --git a/kelakon.pro b/kelakon.pro
index 9f3734a..8928b9b 100644
--- a/kelakon.pro
+++ b/kelakon.pro
@@ -21,7 +21,7 @@ LIBS += \
 
 android {
 	LIBS += \
-		-L/opt/Qt5.14.2/5.14.2/android/lib \
+		-L/opt/Qt/5.15.1/android/lib \
 		-lc++
 	QT += svg
 	certs.path = /assets/certs
@@ -31,50 +31,50 @@ android {
 
 contains(ANDROID_TARGET_ARCH,arm64-v8a) {
 	LIBS += \
-		-L/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21 \
+		-L/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21 \
 		-lqrtclient_arm64-v8a
 	ANDROID_EXTRA_LIBS += \
-		/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libcrypto_1_1.so \
-		/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libssl_1_1.so \
-		/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libcurl.so \
-		/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/librtclient.so \
-		/opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_arm64-v8a.so
+		/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libcrypto_1_1.so \
+		/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libssl_1_1.so \
+		/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libcurl.so \
+		/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/librtclient.so \
+		/opt/Qt/5.15.1/android/lib/libqrtclient_arm64-v8a.so
 }
 
 contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
 	LIBS += \
-		-L/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21 \
+		-L/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/16 \
 		-lqrtclient_armeabi-v7a
 	ANDROID_EXTRA_LIBS += \
-		/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21/libcrypto_1_1.so \
-		/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21/libssl_1_1.so \
-		/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21/libcurl.so \
-		/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21/librtclient.so \
-		/opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_armeabi-v7a.so
+		/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/16/libcrypto_1_1.so \
+		/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/16/libssl_1_1.so \
+		/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/16/libcurl.so \
+		/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/16/librtclient.so \
+		/opt/Qt/5.15.1/android/lib/libqrtclient_armeabi-v7a.so
 }
 
 contains(ANDROID_TARGET_ARCH,x86) {
 	LIBS += \
-		-L/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21 \
+		-L/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/16 \
 		-lqrtclient_x86
 	ANDROID_EXTRA_LIBS += \
-		/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21/libcrypto_1_1.so \
-		/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21/libssl_1_1.so \
-		/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21/libcurl.so \
-		/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21/librtclient.so \
-		/opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_x86.so
+		/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/16/libcrypto_1_1.so \
+		/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/16/libssl_1_1.so \
+		/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/16/libcurl.so \
+		/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/16/librtclient.so \
+		/opt/Qt/5.15.1/android/lib/libqrtclient_x86.so
 }
 
 contains(ANDROID_TARGET_ARCH,x86_64) {
 	LIBS += \
-		-L/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21 \
+		-L/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21 \
 		-lqrtclient_x86_64
 	ANDROID_EXTRA_LIBS += \
-		/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/libcrypto_1_1.so \
-		/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/libssl_1_1.so \
-		/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/libcurl.so \
-		/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/librtclient.so \
-		/opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_x86_64.so
+		/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/libcrypto_1_1.so \
+		/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/libssl_1_1.so \
+		/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/libcurl.so \
+		/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/librtclient.so \
+		/opt/Qt/5.15.1/android/lib/libqrtclient_x86_64.so
 }
 
 debug: DEFINES += DEBUG
diff --git a/qrtclient b/qrtclient
-Subproject 7eae4b0263a2e1454fb35f7962d72b3bf25fe6f
+Subproject 8fac36ea8dff207769775cbdfe3a8ce49fb794f