From 4216ba7c37dbdf67bfb5dc793d01a232ce4ea762 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 9 Apr 2025 09:54:40 -0700 Subject: QSqlDatabase: make evident the name of the driver that failed to load Tell me this isn't confusing: Got keys from plugin meta data ("QMYSQL3", "QMYSQL", "QMARIADB") QSqlDatabase: driver not loaded QSqlDatabase: available drivers: QSQLITE QMARIADB QMYSQL QMYSQL3 This also merges the two messages into a single line, which is nicer for rich logging environments. Pick-to: 6.8 6.9 Change-Id: Ieb80c6571213dddc518bfffdb6c86632df8f932c Reviewed-by: Christian Ehrlicher --- src/sql/kernel/qsqldatabase.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/sql/kernel/qsqldatabase.cpp') diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 70840010555..d07afd703bd 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -658,9 +658,9 @@ void QSqlDatabasePrivate::init(const QString &type) driver = qLoadPlugin(loader(), type); if (!driver) { - qCWarning(lcSqlDb, "QSqlDatabase: %ls driver not loaded", qUtf16Printable(type)); - qCWarning(lcSqlDb, "QSqlDatabase: available drivers: %ls", - qUtf16Printable(QSqlDatabase::drivers().join(u' '))); + qCWarning(lcSqlDb, + "QSqlDatabase: can not load requested driver '%ls', available drivers: %ls", + qUtf16Printable(type), qUtf16Printable(QSqlDatabase::drivers().join(u' '))); if (!QCoreApplication::instanceExists()) qCWarning(lcSqlDb, "QSqlDatabase: an instance of QCoreApplication is required for loading driver plugins"); driver = shared_null()->driver; -- cgit v1.2.3