Updated sources to Qt 6.8

Author: FalsinSoft

Demo/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.1'
+        classpath 'com.android.tools.build:gradle:8.6.0'
     }
 }
 
@@ -14,11 +14,11 @@ 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'
+    implementation 'androidx.core:core:1.13.1'
 }
 
 android {
@@ -29,12 +29,14 @@ 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!
      *******************************************************/
 
+    namespace androidPackageName
     compileSdkVersion androidCompileSdkVersion
     buildToolsVersion androidBuildToolsVersion
     ndkVersion androidNdkVersion

QSQLite3MultipleCiphers/qsql_sqlite.cpp

@@ -7,6 +7,7 @@
 #include <qdatetime.h>
 #include <qdebug.h>
 #include <qlist.h>
+#include <qloggingcategory.h>
 #include <qsqlerror.h>
 #include <qsqlfield.h>
 #include <qsqlindex.h>
@@ -38,6 +39,8 @@ Q_DECLARE_METATYPE(sqlite3_stmt*)
 
 QT_BEGIN_NAMESPACE
 
+static Q_LOGGING_CATEGORY(lcSqlite, "qt.sql.sqlite")
+
 using namespace Qt::StringLiterals;
 
 static int qGetColumnType(const QString &tpName)
@@ -247,7 +250,6 @@ void QSQLiteResultPrivate::initColumns(bool emptyResultset)
         }
 
         QSqlField fld(colName, QMetaType(fieldType), tableName);
-        fld.setSqlType(stp);
         rInf.append(fld);
     }
 }
@@ -804,7 +806,7 @@ bool QSQLiteDriver::open(const QString & db, const QString &, const QString &, c
         }
 #endif
         else
-            qWarning("Unsupported option '%ls'", qUtf16Printable(option.toString()));
+            qCWarning(lcSqlite, "Unsupported option '%ls'", qUtf16Printable(option.toString()));
     }
 
     int openMode = (openReadOnlyOption ? SQLITE_OPEN_READONLY : (SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE));
@@ -815,7 +817,7 @@ bool QSQLiteDriver::open(const QString & db, const QString &, const QString &, c
 #if defined(SQLITE_OPEN_NOFOLLOW)
         openMode |= SQLITE_OPEN_NOFOLLOW;
 #else
-        qWarning("SQLITE_OPEN_NOFOLLOW not supported with the SQLite version %s", sqlite3_libversion());
+        qCWarning(lcSqlite, "SQLITE_OPEN_NOFOLLOW not supported with the SQLite version %s", sqlite3_libversion());
 #endif
     }
 
@@ -1056,12 +1058,13 @@ bool QSQLiteDriver::subscribeToNotification(const QString &name)
 {
     Q_D(QSQLiteDriver);
     if (!isOpen()) {
-        qWarning("Database not open.");
+        qCWarning(lcSqlite, "QSQLiteDriver::subscribeToNotification: Database not open.");
         return false;
     }
 
     if (d->notificationid.contains(name)) {
-        qWarning("Already subscribing to '%ls'.", qUtf16Printable(name));
+        qCWarning(lcSqlite, "QSQLiteDriver::subscribeToNotification: Already subscribing to '%ls'.",
+                  qUtf16Printable(name));
         return false;
     }
 
@@ -1077,12 +1080,13 @@ bool QSQLiteDriver::unsubscribeFromNotification(const QString &name)
 {
     Q_D(QSQLiteDriver);
     if (!isOpen()) {
-        qWarning("Database not open.");
+        qCWarning(lcSqlite, "QSQLiteDriver::unsubscribeFromNotification: Database not open.");
         return false;
     }
 
     if (!d->notificationid.contains(name)) {
-        qWarning("Not subscribed to '%ls'.", qUtf16Printable(name));
+        qCWarning(lcSqlite, "QSQLiteDriver::unsubscribeFromNotification: Not subscribed to '%ls'.",
+                  qUtf16Printable(name));
         return false;
     }
 

QSQLite3MultipleCiphers/smain.cpp

@@ -8,6 +8,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 class QSQLite3MultipleCiphersDriverPlugin : public QSqlDriverPlugin
 {
     Q_OBJECT
@@ -27,7 +29,7 @@ QSQLite3MultipleCiphersDriverPlugin::QSQLite3MultipleCiphersDriverPlugin()
 
 QSqlDriver* QSQLite3MultipleCiphersDriverPlugin::create(const QString &name)
 {
-    if(name == QLatin1String("SQLITE_MULTIPLE_CIPHERS"))
+    if(name == "SQLITE_MULTIPLE_CIPHERS"_L1)
     {
         QSQLite3MultipleCiphersDriver *driver = new QSQLite3MultipleCiphersDriver();
         return driver;