diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-23 15:18:35 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 22:38:28 +0100 |
| commit | 71fe29711fcb88adcc191f1350e13f7c2544c642 (patch) | |
| tree | 3a1620471f3569e16865600a8ab7171952cc552d /src/plugins/sqldrivers/ibase | |
| parent | 5f320e2f97df1ef48a7877feb418e3f63421b485 (diff) | |
Use new plugin system for SQL drivers.
Change-Id: I1d4db9ecc7e1cbca66674d13748070f4b19d5b8c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/plugins/sqldrivers/ibase')
| -rw-r--r-- | src/plugins/sqldrivers/ibase/ibase.json | 3 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/ibase/ibase.pro | 1 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/ibase/main.cpp | 12 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/plugins/sqldrivers/ibase/ibase.json b/src/plugins/sqldrivers/ibase/ibase.json new file mode 100644 index 0000000000..e2186b32cd --- /dev/null +++ b/src/plugins/sqldrivers/ibase/ibase.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "QIBASE" ] +} diff --git a/src/plugins/sqldrivers/ibase/ibase.pro b/src/plugins/sqldrivers/ibase/ibase.pro index 7870ec8465..ca2a91aa2e 100644 --- a/src/plugins/sqldrivers/ibase/ibase.pro +++ b/src/plugins/sqldrivers/ibase/ibase.pro @@ -1,6 +1,7 @@ TARGET = qsqlibase SOURCES = main.cpp +OTHER_FILES += ibase.json include(../../../sql/drivers/ibase/qsql_ibase.pri) include(../qsqldriverbase.pri) diff --git a/src/plugins/sqldrivers/ibase/main.cpp b/src/plugins/sqldrivers/ibase/main.cpp index c1018944fd..e820c6a333 100644 --- a/src/plugins/sqldrivers/ibase/main.cpp +++ b/src/plugins/sqldrivers/ibase/main.cpp @@ -47,6 +47,9 @@ QT_BEGIN_NAMESPACE class QIBaseDriverPlugin : public QSqlDriverPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QSqlDriverFactoryInterface" FILE "ibase.json") + public: QIBaseDriverPlugin(); @@ -70,12 +73,9 @@ QSqlDriver* QIBaseDriverPlugin::create(const QString &name) QStringList QIBaseDriverPlugin::keys() const { - QStringList l; - l << QLatin1String("QIBASE"); - return l; + return QStringList(QStringLiteral("QIBASE")); } -Q_EXPORT_STATIC_PLUGIN(QIBaseDriverPlugin) -Q_EXPORT_PLUGIN2(qsqlibase, QIBaseDriverPlugin) - QT_END_NAMESPACE + +#include "main.moc" |