CI: android update qt to 6.10.2

Author: KangLin

.github/workflows/android.yml

@@ -18,13 +18,13 @@ jobs:
           - qt_arch: android_arm64_v8a
             VCPKG_TARGET_TRIPLET: arm64-android
             ANDROID_ABI: arm64-v8a
-            qt_version: 6.9.3
+            qt_version: 6.10.2
             BUILD_TYPE: Release
 
           - qt_arch: android_x86_64
             VCPKG_TARGET_TRIPLET: x64-android
             ANDROID_ABI: x86_64
-            qt_version: 6.9.3
+            qt_version: 6.10.2
             BUILD_TYPE: Release
 
     # See: [About GitHub-hosted runners](https://docs.github.com/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners)
@@ -97,7 +97,7 @@ jobs:
 
       - name: Install Qt of linux_gcc_64
         uses: jurplel/install-qt-action@v4
-        if: ${{ matrix.qt_version == '6.9.3' }}
+        if: ${{ matrix.qt_version == '6.10.2' }}
         with:
           dir: '${{env.TOOLS_DIR}}/qt' # optional
           version: '${{matrix.qt_version}}'

.github/workflows/build.yml

@@ -215,7 +215,7 @@ jobs:
           echo "|       | x86-64 (64-bit) | x86-32 (32-bit) | AArch64 (ARM64) | ARMv7 (32-bit) |:us: Comment|:cn: 备注|" >> ${{github.workspace}}/Release.md
           echo "|:-     | :-------------- | :-------------- | :-------------- | :------------- |:------|---|" >> ${{github.workspace}}/Release.md
           echo "|Windows|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_64_qt6.10.2_Setup.exe)|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win32_msvc2019_qt5.15.2_Setup.exe)|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_arm64_qt6.10.2_Setup.exe)| |Supported platforms: [x86-32(Qt5)](https://doc.qt.io/qt-5/supported-platforms.html) [x86-64(Qt6)](https://doc.qt.io/qt-6/supported-platforms.html)|支持平台：[x86-32(Qt5)](https://doc.qt.io/qt-5/supported-platforms.html) [x86-64(Qt6)](https://doc.qt.io/qt-6/supported-platforms.html)|" >> ${{github.workspace}}/Release.md
-          echo "|Android|[APK](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_android_x86_64_qt6.9.3_Release.apk) | |[APK](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_android_arm64_v8a_qt6.9.3_Release.apk)| |Experiment|实验性的|" >> ${{github.workspace}}/Release.md
+          echo "|Android|[APK](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_android_x86_64_qt6.10.2_Release.apk) | |[APK](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_android_arm64_v8a_qt6.10.2_Release.apk)| |Experiment|实验性的|" >> ${{github.workspace}}/Release.md
           echo "|Macos|[App zip](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_macos-15-intel.zip)  [dmg](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_macos-15-intel.dmg)||[App zip](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_macos-14.zip)  [dmg](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_macos-14.dmg)||Experiment|实验性的|" >> ${{github.workspace}}/Release.md
 
           echo "|Linux|[zip file of install AppImage](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64_Setup.zip)| |[zip file of install AppImage](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_aarch64_Setup.zip)| |Unzip the zip file, then execute \`install.sh\` to install shortcuts for application, links, and directories in graphical user interfaces (GUIs), or execute \`RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_*.AppImage\` to run program in the terminal.|解压 zip 文件，然后执行  \`install.sh\`， 安装用于图形界面的目录、桌面快捷方式；或者在终端中执行  \`RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_*.AppImage\`  文件，运行程序。|" >> ${{github.workspace}}/Release.md

App/Client/CMakeLists.txt

@@ -194,21 +194,3 @@ endif()
 
 # Install QIcon theme
 INSTALL_ICON_THEME(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Resource/icons)
-
-if(ANDROID)
-    find_package(QFtpServerLib)
-    if(QFtpServerLib_FOUND)
-        get_target_property(QFtpServerLib_Location QFtpServerLib IMPORTED_LOCATION)
-        list(APPEND android_extra_libs ${QFtpServerLib_Location})
-    endif()
-    find_package(Qt${QT_VERSION_MAJOR}Keychain)
-    if(Qt${QT_VERSION_MAJOR}Keychain_FOUND)
-        get_target_property(QtKeychain_Location Qt${QT_VERSION_MAJOR}Keychain::Qt${QT_VERSION_MAJOR}Keychain IMPORTED_LOCATION)
-        list(APPEND android_extra_libs ${QtKeychain_Location})
-    endif()
-    message("QT_ANDROID_EXTRA_LIBS: ${android_extra_libs}")
-    if(android_extra_libs)
-        set_target_properties(${PROJECT_NAME} PROPERTIES
-            QT_ANDROID_EXTRA_LIBS ${android_extra_libs})
-    endif()
-endif()