Moving to Qt6:

1) removing of deprecated classes
2) update of IPC mechanism

client/client.pro

@@ -1,4 +1,4 @@
-QT += widgets core gui network xml remoteobjects quick svg quickcontrols2 core5compat
+QT += widgets core gui network xml remoteobjects quick svg quickcontrols2
 equals(QT_MAJOR_VERSION, 6): QT += core5compat
 
 TARGET = AmneziaVPN
@@ -46,6 +46,8 @@ HEADERS  += \
     debug.h \
     defines.h \
     managementserver.h \
+    platforms/android/androidutils.h \
+    platforms/android/androidvpnactivity.h \
     platforms/ios/MobileUtils.h \
     platforms/linux/leakdetector.h \
     protocols/protocols_defs.h \
@@ -108,6 +110,8 @@ SOURCES  += \
     debug.cpp \
     main.cpp \
     managementserver.cpp \
+    platforms/android/androidutils.cpp \
+    platforms/android/androidvpnactivity.cpp \
     platforms/ios/MobileUtils.cpp \
     platforms/linux/leakdetector.cpp \
     protocols/protocols_defs.cpp \
@@ -246,15 +250,12 @@ android {
     versionAtLeast(QT_VERSION, 6.0.0) {
         # We need to include qtprivate api's
         # As QAndroidBinder is not yet implemented with a public api
-        QT+=core-private
-        ANDROID_ABIS=ANDROID_TARGET_ARCH
-
-        # for not changing qtkeychain sources for qt6
-        QT -= androidextras
-    }
-    else {
-        QT += androidextras
+        QT += core-private
+        ANDROID_ABIS = $$ANDROID_TARGET_ARCH
     }
+#    else {
+#        QT += androidextras
+#    }
 
    DEFINES += MVPN_ANDROID
 
@@ -298,6 +299,7 @@ android {
       ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 
    for (abi, ANDROID_ABIS): {
+
       equals(ANDROID_TARGET_ARCH,$$abi) {
          LIBS += $$PWD/3rd/OpenSSL/lib/android/$${abi}/libcrypto.a
          LIBS += $$PWD/3rd/OpenSSL/lib/android/$${abi}/libssl.a