chore: upgrade Qt to 6.10.0

Author: Bionus

.github/workflows/build.yml

@@ -13,14 +13,14 @@ on:
       - crowdin
 
 env:
-  QT_VERSION: 6.9.1
+  QT_VERSION: 6.10.0
   QT_MODULES: qtmultimedia qtimageformats qtnetworkauth qtshadertools
   IS_RELEASE: ${{ startsWith(github.ref, 'refs/tags/v') }}
   IS_NIGHTLY: ${{ !startsWith(github.ref, 'refs/tags/v') }}
   CMAKE_BUILD_PARALLEL_LEVEL: 2
   QSCINTILLA_VERSION: 2.14.1
   QSCINTILLA_DIR: QScintilla_src-2.14.1
-  ANDROID_NDK_VERSION: 25.1.8937393
+  ANDROID_NDK_VERSION: 27.2.12479018
 
 jobs:
   # Gatekeeper job to skip build for Crowdin PRs
@@ -370,7 +370,7 @@ jobs:
     env:
       GRABBER_VERSION: ${{ needs.version.outputs.version }}
       GRABBER_IS_NIGHTLY: ${{ needs.version.outputs.nightly }}
-      MYSQL_DRIVER_URL: https://github.com/thecodemonkey86/qt_mysql_driver/releases/download/qmysql_6.9.1/qsqlmysql.dll_Qt_SQL_driver_6.9.1_MSVC2022_64-bit.zip
+      MYSQL_DRIVER_URL: https://github.com/thecodemonkey86/qt_mysql_driver/releases/download/qmysql_6.10.0/qsqlmysql.dll_Qt_SQL_driver_6.10.0_MSVC2022_64-bit.zip
       OPENSSL_ROOT_DIR: ${{ github.workspace }}\vendor\OpenSSL
       MYSQL_DRIVER_DIR: ${{ github.workspace }}\vendor\MySQL_driver
       VCINSTALLDIR: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC

scripts/package-appimage.sh

@@ -14,7 +14,7 @@ popd
 
 # See https://github.com/probonopd/linuxdeployqt
 export VERSION=$GRABBER_VERSION
-./vendor/linuxdeployqt.AppImage "$APP_DIR/usr/share/applications/org.bionus.Grabber.desktop" -appimage -extra-plugins=platforms/libqoffscreen.so -updateinformation="gh-releases-zsync|Bionus|imgbrd-grabber|latest|Grabber_*-x86_64.AppImage.zsync"
+./vendor/linuxdeployqt.AppImage "$APP_DIR/usr/share/applications/org.bionus.Grabber.desktop" -appimage -extra-plugins=platforms/libqoffscreen.so -exclude-libs=libclntsh -updateinformation="gh-releases-zsync|Bionus|imgbrd-grabber|latest|Grabber_*-x86_64.AppImage.zsync"
 mv "Grabber-$VERSION-x86_64.AppImage" "Grabber_$VERSION-x86_64.AppImage"
 mv "Grabber-$VERSION-x86_64.AppImage.zsync" "Grabber_$VERSION-x86_64.AppImage.zsync"
 

src/dist/android/AndroidManifest.xml

@@ -23,7 +23,6 @@
         android:hardwareAccelerated="true"
         android:label="Grabber"
         android:requestLegacyExternalStorage="true"
-        android:allowNativeHeapPointerTagging="false"
         android:allowBackup="true"
         android:fullBackupOnly="false"
         android:icon="@mipmap/ic_launcher"

src/dist/android/build.gradle

@@ -5,7 +5,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.1'
+        //noinspection AndroidGradlePluginVersion
+        classpath 'com.android.tools.build:gradle:8.10.1'
     }
 }
 
@@ -14,11 +15,12 @@ repositories {
     mavenCentral()
 }
 
-apply plugin: 'com.android.application'
+apply plugin: qtGradlePluginType
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-    implementation 'androidx.core:core:1.10.1'
+    //noinspection GradleDependency
+    implementation 'androidx.core:core:1.16.0'
 }
 
 android {
@@ -29,15 +31,17 @@ android {
      * - qtAndroidDir - holds the path to qt android files
      *                   needed to build any Qt application
      *                   on Android.
+     * - qtGradlePluginType - whether to build an app or a library
      *
      * are defined in gradle.properties file. This file is
      * updated by QtCreator and androiddeployqt tools.
      * Changing them manually might break the compilation!
      *******************************************************/
 
-    compileSdkVersion 33
+    namespace = androidPackageName
+    compileSdkVersion androidCompileSdkVersion
     buildToolsVersion androidBuildToolsVersion
-    ndkVersion androidNdkVersion
+    ndkVersion = androidNdkVersion
 
     // Extract native libraries from the APK
     packagingOptions.jniLibs.useLegacyPackaging true
@@ -57,6 +61,7 @@ android {
 
     tasks.withType(JavaCompile) {
         options.incremental = true
+        options.compilerArgs += ['-Xlint:all']
     }
 
     compileOptions {
@@ -65,7 +70,7 @@ android {
     }
 
     lintOptions {
-        abortOnError false
+        abortOnError = false
     }
 
     // Do not compress Qt binary resources file

src/gui-qml/CMakeLists.txt

@@ -9,6 +9,7 @@ set(QT_LIBRARIES Qt6::Core Qt6::Quick Qt6::Multimedia Qt6::Network Qt6::Sql)
 
 # Android specials
 if(ANDROID)
+    find_package(Qt6 COMPONENTS Core CorePrivate REQUIRED)
 	set(QT_LIBRARIES ${QT_LIBRARIES} Qt6::CorePrivate)
 endif()
 

src/gui/CMakeLists.txt

@@ -46,6 +46,7 @@ endif()
 
 # Android specials
 if(ANDROID)
+    find_package(Qt6 COMPONENTS Core CorePrivate REQUIRED)
 	set(QT_LIBRARIES ${QT_LIBRARIES} Qt6::CorePrivate)
 endif()
 

src/lib/CMakeLists.txt

@@ -15,6 +15,7 @@ endif()
 
 # Android specials
 if(ANDROID)
+    find_package(Qt6 COMPONENTS Core CorePrivate REQUIRED)
 	set(QT_LIBRARIES ${QT_LIBRARIES} Qt6::CorePrivate)
 endif()
 

src/lib/tests/src/functions-test.cpp

@@ -570,8 +570,8 @@ TEST_CASE("Functions")
 		REQUIRE(getKeySequence(settings, "not-found", QKeySequence::Open, Qt::Key_D).toString() == QString("Ctrl+O"));
 
 		#ifndef Q_OS_MAC
-			// On macOS, QKeySequence::Preferences is defined, so it would return "Ctrl+," rather than "D"
-			REQUIRE(getKeySequence(settings, "not-found", QKeySequence::Preferences, Qt::Key_D).toString() == QString("D"));
+			// QKeySequence::SelectStartOfBlock is only defined on macOS (see src/gui/kernel/qplatformtheme.cpp)
+			REQUIRE(getKeySequence(settings, "not-found", QKeySequence::SelectStartOfBlock, Qt::Key_D).toString() == QString("D"));
 		#endif
 	}