Skip to content

Commit e99a9dd

Browse files
author
Bernhard Stöcker
committed
Update Qt 6.6.2
1 parent aa027b0 commit e99a9dd

File tree

3 files changed

+44
-50
lines changed

3 files changed

+44
-50
lines changed

‎.cmake.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
set(QT_REPO_MODULE_VERSION "6.6.0")
1+
set(QT_REPO_MODULE_VERSION "6.6.2")

‎install_manifest.txt

+32-32
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfig.cmake
2-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfigVersion.cmake
3-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfigVersionImpl.cmake
4-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/./plugins/sqldrivers/qsqlpsql.dll
5-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginTargets.cmake
6-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginTargets-relwithdebinfo.cmake
7-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/./plugins/sqldrivers/qsqlpsql.pdb
8-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginAdditionalTargetInfo.cmake
9-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfig.cmake
10-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersion.cmake
11-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersionImpl.cmake
12-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/./plugins/sqldrivers/qsqlmysql.dll
13-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets.cmake
14-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets-relwithdebinfo.cmake
15-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/./plugins/sqldrivers/qsqlmysql.pdb
16-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginAdditionalTargetInfo.cmake
17-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfig.cmake
18-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfigVersion.cmake
19-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfigVersionImpl.cmake
20-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/./plugins/sqldrivers/qsqlodbc.dll
21-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginTargets.cmake
22-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginTargets-relwithdebinfo.cmake
23-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/./plugins/sqldrivers/qsqlodbc.pdb
24-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginAdditionalTargetInfo.cmake
25-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfig.cmake
26-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfigVersion.cmake
27-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfigVersionImpl.cmake
28-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/./plugins/sqldrivers/qsqlite.dll
29-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginTargets.cmake
30-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginTargets-relwithdebinfo.cmake
31-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/./plugins/sqldrivers/qsqlite.pdb
32-
C:/Qt/Qt5.12/6.6.0/msvc2019_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginAdditionalTargetInfo.cmake
1+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfig.cmake
2+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfigVersion.cmake
3+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfigVersionImpl.cmake
4+
C:/Qt/Qt5.12/6.6.2/mingw_64/./plugins/sqldrivers/qsqlpsql.dll
5+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginTargets.cmake
6+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginTargets-relwithdebinfo.cmake
7+
C:/Qt/Qt5.12/6.6.2/mingw_64/./plugins/sqldrivers/qsqlpsql.debug
8+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginAdditionalTargetInfo.cmake
9+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfig.cmake
10+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersion.cmake
11+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersionImpl.cmake
12+
C:/Qt/Qt5.12/6.6.2/mingw_64/./plugins/sqldrivers/qsqlmysql.dll
13+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets.cmake
14+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets-relwithdebinfo.cmake
15+
C:/Qt/Qt5.12/6.6.2/mingw_64/./plugins/sqldrivers/qsqlmysql.debug
16+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginAdditionalTargetInfo.cmake
17+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfig.cmake
18+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfigVersion.cmake
19+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfigVersionImpl.cmake
20+
C:/Qt/Qt5.12/6.6.2/mingw_64/./plugins/sqldrivers/qsqlodbc.dll
21+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginTargets.cmake
22+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginTargets-relwithdebinfo.cmake
23+
C:/Qt/Qt5.12/6.6.2/mingw_64/./plugins/sqldrivers/qsqlodbc.debug
24+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginAdditionalTargetInfo.cmake
25+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfig.cmake
26+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfigVersion.cmake
27+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfigVersionImpl.cmake
28+
C:/Qt/Qt5.12/6.6.2/mingw_64/./plugins/sqldrivers/qsqlite.dll
29+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginTargets.cmake
30+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginTargets-relwithdebinfo.cmake
31+
C:/Qt/Qt5.12/6.6.2/mingw_64/./plugins/sqldrivers/qsqlite.debug
32+
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginAdditionalTargetInfo.cmake

‎mysql/qsql_mysql.cpp

+11-17
Original file line numberDiff line numberDiff line change
@@ -919,9 +919,8 @@ bool QMYSQLResult::exec()
919919
return false;
920920
}
921921

922-
if (mysql_stmt_param_count(d->stmt) > 0 &&
923-
mysql_stmt_param_count(d->stmt) == (uint)values.size()) {
924-
922+
const unsigned long paramCount = mysql_stmt_param_count(d->stmt);
923+
if (paramCount > 0 && paramCount == static_cast<size_t>(values.size())) {
925924
nullVector.resize(values.size());
926925
for (qsizetype i = 0; i < values.size(); ++i) {
927926
const QVariant &val = boundValues().at(i);
@@ -1003,7 +1002,11 @@ bool QMYSQLResult::exec()
10031002
}
10041003
}
10051004

1005+
#if defined(MARIADB_VERSION_ID) || MYSQL_VERSION_ID < 80300
10061006
r = mysql_stmt_bind_param(d->stmt, d->outBinds);
1007+
#else
1008+
r = mysql_stmt_bind_named_param(d->stmt, d->outBinds, paramCount, nullptr);
1009+
#endif
10071010
if (r != 0) {
10081011
setLastError(qMakeStmtError(QCoreApplication::translate("QMYSQLResult",
10091012
"Unable to bind value"), QSqlError::StatementError, d->stmt));
@@ -1472,21 +1475,12 @@ QSqlIndex QMYSQLDriver::primaryIndex(const QString &tablename) const
14721475

14731476
QSqlRecord QMYSQLDriver::record(const QString &tablename) const
14741477
{
1475-
Q_D(const QMYSQLDriver);
1476-
const QString table = stripDelimiters(tablename, QSqlDriver::TableName);
1477-
1478-
QSqlRecord info;
14791478
if (!isOpen())
1480-
return info;
1481-
MYSQL_RES *r = mysql_list_fields(d->mysql, table.toUtf8().constData(), nullptr);
1482-
if (!r)
1483-
return info;
1484-
1485-
MYSQL_FIELD *field;
1486-
while ((field = mysql_fetch_field(r)))
1487-
info.append(qToField(field));
1488-
mysql_free_result(r);
1489-
return info;
1479+
return {};
1480+
QSqlQuery i(createResult());
1481+
QString stmt("SELECT * FROM %1 LIMIT 0"_L1);
1482+
i.exec(stmt.arg(escapeIdentifier(tablename, QSqlDriver::TableName)));
1483+
return i.record();
14901484
}
14911485

14921486
QVariant QMYSQLDriver::handle() const

0 commit comments

Comments
 (0)