From 71fe29711fcb88adcc191f1350e13f7c2544c642 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 23 Feb 2012 15:18:35 +0100 Subject: Use new plugin system for SQL drivers. Change-Id: I1d4db9ecc7e1cbca66674d13748070f4b19d5b8c Reviewed-by: Lars Knoll --- src/plugins/sqldrivers/oci/main.cpp | 8 +++++--- src/plugins/sqldrivers/oci/oci.json | 3 +++ src/plugins/sqldrivers/oci/oci.pro | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 src/plugins/sqldrivers/oci/oci.json (limited to 'src/plugins/sqldrivers/oci') diff --git a/src/plugins/sqldrivers/oci/main.cpp b/src/plugins/sqldrivers/oci/main.cpp index 4e5a07a64c..205bfae783 100644 --- a/src/plugins/sqldrivers/oci/main.cpp +++ b/src/plugins/sqldrivers/oci/main.cpp @@ -47,6 +47,9 @@ QT_BEGIN_NAMESPACE class QOCIDriverPlugin : public QSqlDriverPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QSqlDriverFactoryInterface" FILE "oci.json") + public: QOCIDriverPlugin(); @@ -76,7 +79,6 @@ QStringList QOCIDriverPlugin::keys() const return l; } -Q_EXPORT_STATIC_PLUGIN(QOCIDriverPlugin) -Q_EXPORT_PLUGIN2(qsqloci, QOCIDriverPlugin) - QT_END_NAMESPACE + +#include "main.moc" diff --git a/src/plugins/sqldrivers/oci/oci.json b/src/plugins/sqldrivers/oci/oci.json new file mode 100644 index 0000000000..cbed8fc1ac --- /dev/null +++ b/src/plugins/sqldrivers/oci/oci.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "QOCI8", "QOCI" ] +} diff --git a/src/plugins/sqldrivers/oci/oci.pro b/src/plugins/sqldrivers/oci/oci.pro index d7dcce9e35..89642f3653 100644 --- a/src/plugins/sqldrivers/oci/oci.pro +++ b/src/plugins/sqldrivers/oci/oci.pro @@ -1,6 +1,7 @@ TARGET = qsqloci SOURCES = main.cpp +OTHER_FILES += oci.json include(../../../sql/drivers/oci/qsql_oci.pri) include(../qsqldriverbase.pri) -- cgit v1.2.3