QSqlDatabase: make evident the name of the driver that failed to load6.8

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.

Change-Id: Ieb80c6571213dddc518bfffdb6c86632df8f932c
Reviewed-by: Christian Ehrlicher <[email protected]>
(cherry picked from commit 4216ba7c37dbdf67bfb5dc793d01a232ce4ea762)
(cherry picked from commit 22dd10e261c1c9ab46a8bfe99f574bae1c6c01e9)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp
index c25fabf0a4b..1c6d3325107 100644
--- a/src/sql/kernel/qsqldatabase.cpp
+++ b/src/sql/kernel/qsqldatabase.cpp
@@ -655,9 +655,9 @@ void QSqlDatabasePrivate::init(const QString &type)
         driver = qLoadPlugin<QSqlDriver, QSqlDriverPlugin>(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::instance() == nullptr)
             qCWarning(lcSqlDb, "QSqlDatabase: an instance of QCoreApplication is required for loading driver plugins");
         driver = shared_null()->driver;