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/odbc | |
| 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/odbc')
| -rw-r--r-- | src/plugins/sqldrivers/odbc/main.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/odbc/odbc.json | 2 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/odbc/qsql_odbc.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/sqldrivers/odbc/main.cpp b/src/plugins/sqldrivers/odbc/main.cpp index ac63941a82..e712514a88 100644 --- a/src/plugins/sqldrivers/odbc/main.cpp +++ b/src/plugins/sqldrivers/odbc/main.cpp @@ -61,7 +61,7 @@ QODBCDriverPlugin::QODBCDriverPlugin() QSqlDriver* QODBCDriverPlugin::create(const QString &name) { - if (name == QLatin1String("QODBC") || name == QLatin1String("QODBC3")) { + if (name == QLatin1String("QODBC")) { QODBCDriver* driver = new QODBCDriver(); return driver; } diff --git a/src/plugins/sqldrivers/odbc/odbc.json b/src/plugins/sqldrivers/odbc/odbc.json index 41640776fb..c3f6117f42 100644 --- a/src/plugins/sqldrivers/odbc/odbc.json +++ b/src/plugins/sqldrivers/odbc/odbc.json @@ -1,3 +1,3 @@ { - "Keys": [ "QODBC3", "QODBC" ] + "Keys": [ "QODBC" ] } diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp index 07bd08ca82..72b2133327 100644 --- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp +++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp @@ -336,7 +336,7 @@ static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, const { int nativeCode = -1; QString message = qODBCWarn(p, &nativeCode); - return QSqlError(QLatin1String("QODBC3: ") + err, message, type, + return QSqlError(QLatin1String("QODBC: ") + err, message, type, nativeCode != -1 ? QString::number(nativeCode) : QString()); } @@ -345,7 +345,7 @@ static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, { int nativeCode = -1; QString message = qODBCWarn(p, &nativeCode); - return QSqlError(QLatin1String("QODBC3: ") + err, message, type, + return QSqlError(QLatin1String("QODBC: ") + err, message, type, nativeCode != -1 ? QString::number(nativeCode) : QString()); } |