From f7f5795ec78d28ead77b7a62de68ebf1c172db0c Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Thu, 27 Jun 2024 19:28:17 +0200 Subject: [PATCH] SQL/ODBC: ignore empty connect options Don'tprint a warning on empty connect options/when no connect option is set. This ammends 5a03e5c51b4e5f699d4bf4cf10226758a10e8120. Change-Id: I83ba8a34a3c08dc596c81ccb494f50af80f9b57c Reviewed-by: Axel Spoerl (cherry picked from commit 385c9397712b771e0f2c3f0a6322f0f624f09a8a) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/sqldrivers/odbc/qsql_odbc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp index 976911d4583..0593f0c9062 100644 --- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp +++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp @@ -736,7 +736,7 @@ bool QODBCDriverPrivate::setConnectionOptions(const QString &connOpts) { // Set any connection attributes SQLRETURN r = SQL_SUCCESS; - for (const auto connOpt : QStringTokenizer{connOpts, u';'}) { + for (const auto connOpt : QStringTokenizer{connOpts, u';', Qt::SkipEmptyParts}) { int idx; if ((idx = connOpt.indexOf(u'=')) == -1) { qSqlWarning(("QODBCDriver::open: Illegal connect option value '%1'"_L1)