From 8471d267f15e522836758953ab976beb21f42154 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Fri, 31 Jan 2020 22:16:35 +0100 Subject: 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 --- src/plugins/sqldrivers/oci/main.cpp | 2 +- src/plugins/sqldrivers/oci/oci.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/sqldrivers/oci') diff --git a/src/plugins/sqldrivers/oci/main.cpp b/src/plugins/sqldrivers/oci/main.cpp index e576928d31..db273bfb04 100644 --- a/src/plugins/sqldrivers/oci/main.cpp +++ b/src/plugins/sqldrivers/oci/main.cpp @@ -61,7 +61,7 @@ QOCIDriverPlugin::QOCIDriverPlugin() QSqlDriver* QOCIDriverPlugin::create(const QString &name) { - if (name == QLatin1String("QOCI") || name == QLatin1String("QOCI8")) { + if (name == QLatin1String("QOCI")) { QOCIDriver* driver = new QOCIDriver(); return driver; } diff --git a/src/plugins/sqldrivers/oci/oci.json b/src/plugins/sqldrivers/oci/oci.json index cbed8fc1ac..c2bb8c81f6 100644 --- a/src/plugins/sqldrivers/oci/oci.json +++ b/src/plugins/sqldrivers/oci/oci.json @@ -1,3 +1,3 @@ { - "Keys": [ "QOCI8", "QOCI" ] + "Keys": [ "QOCI" ] } -- cgit v1.2.3