Update Qt 6.9.1

Author: Bernhard Stöcker

.cmake.conf

@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.9.0")
+set(QT_REPO_MODULE_VERSION "6.9.1")

CMakeLists.txt

@@ -16,7 +16,7 @@ if(NOT PROJECT_NAME STREQUAL "QtBase" AND NOT PROJECT_NAME STREQUAL "Qt")
         VERSION "${QT_REPO_MODULE_VERSION}"
         DESCRIPTION "Qt6 SQL driver plugins"
         HOMEPAGE_URL "https://qt.io/"
-        LANGUAGES CXX C ASM
+        LANGUAGES CXX C
     )
     find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
         BuildInternals

configure.cmake

@@ -60,7 +60,7 @@ qt_feature("sql-sqlite" PRIVATE
     LABEL "SQLite"
     CONDITION QT_FEATURE_datestring
 )
-qt_feature("system-sqlite" PRIVATE
+qt_feature("system-sqlite" PRIVATE SYSTEM_LIBRARY
     LABEL "  Using system provided SQLite"
     AUTODETECT OFF
     CONDITION QT_FEATURE_sql_sqlite AND SQLite3_FOUND

mysql/qsql_mysql.cpp

@@ -1094,14 +1094,14 @@ static void qLibraryInit()
     }
 #endif // Q_NO_MYSQL_EMBEDDED
 
-#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID)
+#if defined(MARIADB_PACKAGE_VERSION_ID)
     qAddPostRoutine([]() { mysql_server_end(); });
 #endif
 }
 
 static void qLibraryEnd()
 {
-#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
+#if !defined(MARIADB_PACKAGE_VERSION_ID)
 # if !defined(Q_NO_MYSQL_EMBEDDED)
     mysql_library_end();
 # endif
@@ -1360,7 +1360,7 @@ bool QMYSQLDriver::open(const QString &db,
 
     // try utf8 with non BMP first, utf8 (BMP only) if that fails
     static const char wanted_charsets[][8] = { "utf8mb4", "utf8" };
-#ifdef MARIADB_VERSION_ID
+#if defined(MARIADB_PACKAGE_VERSION_ID)
     MARIADB_CHARSET_INFO *cs = nullptr;
     for (const char *p : wanted_charsets) {
         cs = mariadb_get_charset_by_name(p);
@@ -1512,7 +1512,7 @@ QSqlRecord QMYSQLDriver::record(const QString &tablename) const
             + d->dbName + "' AND table_name = '%1'"_L1;
     const auto baTableName = tablename.toUtf8();
     QVarLengthArray<char> tableNameQuoted(baTableName.size() * 2 + 1);
-#if defined(MARIADB_VERSION_ID)
+#if defined(MARIADB_PACKAGE_VERSION_ID)
     const auto len = mysql_real_escape_string(d->mysql, tableNameQuoted.data(),
                                               baTableName.data(), baTableName.size());
 #else
@@ -1614,15 +1614,15 @@ QString QMYSQLDriver::formatValue(const QSqlField &field, bool trimStrings) cons
             }
             Q_FALLTHROUGH();
         case QMetaType::QDateTime:
-            if (QDateTime dt = field.value().toDateTime(); dt.isValid()) {
+            if (QDateTime dt = field.value().toDateTime().toUTC(); dt.isValid()) {
                 // MySQL format doesn't like the "Z" at the end, but does allow
                 // "+00:00" starting in version 8.0.19. However, if we got here,
                 // it's because the MySQL server is too old for prepared queries
                 // in the first place, so it won't understand timezones either.
                 r = u'\'' +
                         dt.date().toString(Qt::ISODate) +
                         u'T' +
-                        dt.time().toString(Qt::ISODate) +
+                        dt.time().toString(Qt::ISODateWithMs) +
                         u'\'';
             }
             break;