Skip to content

Commit 8d87e4e

Browse files
author
Bernhard Stöcker
committed
Update Qt 6.9.0
1 parent 24a3305 commit 8d87e4e

File tree

5 files changed

+21
-4
lines changed

5 files changed

+21
-4
lines changed

.cmake.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
set(QT_REPO_MODULE_VERSION "6.8.3")
1+
set(QT_REPO_MODULE_VERSION "6.9.0")

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ if(NOT PROJECT_NAME STREQUAL "QtBase" AND NOT PROJECT_NAME STREQUAL "Qt")
2222
BuildInternals
2323
Core
2424
Sql
25-
Core5Compat
2625
)
2726
# Use qtbase license files for standalone builds.
2827
set(QT_SBOM_LICENSE_DIRS "${PROJECT_SOURCE_DIR}/../../../LICENSES")

mysql/qsql_mysql.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ struct QT_MYSQL_TIME
5353

5454
QT_BEGIN_NAMESPACE
5555

56-
static Q_LOGGING_CATEGORY(lcMysql, "qt.sql.mysql")
56+
Q_STATIC_LOGGING_CATEGORY(lcMysql, "qt.sql.mysql")
5757

5858
using namespace Qt::StringLiterals;
5959

@@ -1519,7 +1519,7 @@ QSqlRecord QMYSQLDriver::record(const QString &tablename) const
15191519
const auto len = mysql_real_escape_string_quote(d->mysql, tableNameQuoted.data(),
15201520
baTableName.data(), baTableName.size(), '\'');
15211521
#endif
1522-
if (i.exec(stmt.arg(QString::fromUtf8(tableNameQuoted.data(), len)))) {
1522+
if (i.exec(stmt.arg(QUtf8StringView(tableNameQuoted.data(), len)))) {
15231523
while (i.next()) {
15241524
const auto colName = i.value(0).toString();
15251525
const auto recordIdx = r.indexOf(colName);

qtsqldrivers-config.h

Whitespace-only changes.

qtsqldrivers-config_p.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#define QT_FEATURE_sql_db2 -1
2+
3+
#define QT_FEATURE_sql_ibase -1
4+
5+
#define QT_FEATURE_sql_mysql 1
6+
7+
#define QT_FEATURE_sql_oci -1
8+
9+
#define QT_FEATURE_sql_odbc 1
10+
11+
#define QT_FEATURE_sql_psql -1
12+
13+
#define QT_FEATURE_sql_sqlite 1
14+
15+
#define QT_FEATURE_system_sqlite -1
16+
17+
#define QT_FEATURE_sql_mimer -1
18+

0 commit comments

Comments
 (0)