diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-01-31 22:16:35 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-02-13 22:42:26 +0100 |
commit | 8471d267f15e522836758953ab976beb21f42154 (patch) | |
tree | eea6cb2c60f5340fc744ebab0bc507665283f3a0 /src/plugins/sqldrivers/mysql | |
parent | 60feaae1967aca5c7b1b0f6cb732962ddd1b2115 (diff) |
QtSql: remove compat SQL plugin names
Remove the compat SQL plugin names (QMYSQL3, QOCI8, QODBC3, QPSQL7)
since they are not needed and just confuse the user
[ChangeLog][QtSql] The compat plugin names QMYSQL3, QOCI8, QODBC3 and
QPSQL7 are no longer available.
Change-Id: I6d88f449ef3e18881a6970fb374ba0ab074ef302
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src/plugins/sqldrivers/mysql')
-rw-r--r-- | src/plugins/sqldrivers/mysql/main.cpp | 1 | ||||
-rw-r--r-- | src/plugins/sqldrivers/mysql/mysql.json | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/sqldrivers/mysql/main.cpp b/src/plugins/sqldrivers/mysql/main.cpp index 4c6753097f..f7d56dd1c9 100644 --- a/src/plugins/sqldrivers/mysql/main.cpp +++ b/src/plugins/sqldrivers/mysql/main.cpp @@ -62,7 +62,6 @@ QMYSQLDriverPlugin::QMYSQLDriverPlugin() QSqlDriver* QMYSQLDriverPlugin::create(const QString &name) { if (name == QLatin1String("QMYSQL") || - name == QLatin1String("QMYSQL3") || name == QLatin1String("QMARIADB")) { QMYSQLDriver* driver = new QMYSQLDriver(); return driver; diff --git a/src/plugins/sqldrivers/mysql/mysql.json b/src/plugins/sqldrivers/mysql/mysql.json index 89f5e65fb9..8fd3d727b1 100644 --- a/src/plugins/sqldrivers/mysql/mysql.json +++ b/src/plugins/sqldrivers/mysql/mysql.json @@ -1,3 +1,3 @@ { - "Keys": [ "QMYSQL3", "QMYSQL", "QMARIADB" ] + "Keys": [ "QMYSQL", "QMARIADB" ] } diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp index 90a810d516..2930df7261 100644 --- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp @@ -337,7 +337,7 @@ static QSqlError qMakeStmtError(const QString& err, QSqlError::ErrorType type, MYSQL_STMT* stmt) { const char *cerr = mysql_stmt_error(stmt); - return QSqlError(QLatin1String("QMYSQL3: ") + err, + return QSqlError(QLatin1String("QMYSQL: ") + err, QString::fromLatin1(cerr), type, QString::number(mysql_stmt_errno(stmt))); } |