From 71fe29711fcb88adcc191f1350e13f7c2544c642 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 23 Feb 2012 15:18:35 +0100
Subject: Use new plugin system for SQL drivers.

Change-Id: I1d4db9ecc7e1cbca66674d13748070f4b19d5b8c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/plugins/sqldrivers/sqlite/smain.cpp   | 12 ++++++------
 src/plugins/sqldrivers/sqlite/sqlite.json |  3 +++
 src/plugins/sqldrivers/sqlite/sqlite.pro  |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 src/plugins/sqldrivers/sqlite/sqlite.json

(limited to 'src/plugins/sqldrivers/sqlite')

diff --git a/src/plugins/sqldrivers/sqlite/smain.cpp b/src/plugins/sqldrivers/sqlite/smain.cpp
index 47cb08b75c..90ed72eedc 100644
--- a/src/plugins/sqldrivers/sqlite/smain.cpp
+++ b/src/plugins/sqldrivers/sqlite/smain.cpp
@@ -47,6 +47,9 @@ QT_BEGIN_NAMESPACE
 
 class QSQLiteDriverPlugin : public QSqlDriverPlugin
 {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QSqlDriverFactoryInterface" FILE "sqlite.json")
+
 public:
     QSQLiteDriverPlugin();
 
@@ -70,12 +73,9 @@ QSqlDriver* QSQLiteDriverPlugin::create(const QString &name)
 
 QStringList QSQLiteDriverPlugin::keys() const
 {
-    QStringList l;
-    l  << QLatin1String("QSQLITE");
-    return l;
+    return QStringList(QStringLiteral("QSQLITE"));
 }
 
-Q_EXPORT_STATIC_PLUGIN(QSQLiteDriverPlugin)
-Q_EXPORT_PLUGIN2(qsqlite, QSQLiteDriverPlugin)
-
 QT_END_NAMESPACE
+
+#include "smain.moc"
diff --git a/src/plugins/sqldrivers/sqlite/sqlite.json b/src/plugins/sqldrivers/sqlite/sqlite.json
new file mode 100644
index 0000000000..3061d83145
--- /dev/null
+++ b/src/plugins/sqldrivers/sqlite/sqlite.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "QSQLITE" ]
+}
diff --git a/src/plugins/sqldrivers/sqlite/sqlite.pro b/src/plugins/sqldrivers/sqlite/sqlite.pro
index f4c1671a4b..d1f4aa7233 100644
--- a/src/plugins/sqldrivers/sqlite/sqlite.pro
+++ b/src/plugins/sqldrivers/sqlite/sqlite.pro
@@ -1,6 +1,7 @@
 TARGET = qsqlite
 
 SOURCES = smain.cpp
+OTHER_FILES += sqlite.json
 include(../../../sql/drivers/sqlite/qsql_sqlite.pri)
 
 wince*: DEFINES += HAVE_LOCALTIME_S=0
-- 
cgit v1.2.3