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/psql | |
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/psql')
-rw-r--r-- | src/plugins/sqldrivers/psql/main.cpp | 8 | ||||
-rw-r--r-- | src/plugins/sqldrivers/psql/psql.json | 3 | ||||
-rw-r--r-- | src/plugins/sqldrivers/psql/psql.pro | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/plugins/sqldrivers/psql/main.cpp b/src/plugins/sqldrivers/psql/main.cpp index db233b9486..117df561ab 100644 --- a/src/plugins/sqldrivers/psql/main.cpp +++ b/src/plugins/sqldrivers/psql/main.cpp @@ -47,6 +47,9 @@ QT_BEGIN_NAMESPACE class QPSQLDriverPlugin : public QSqlDriverPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QSqlDriverFactoryInterface" FILE "psql.json") + public: QPSQLDriverPlugin(); @@ -76,7 +79,6 @@ QStringList QPSQLDriverPlugin::keys() const return l; } -Q_EXPORT_STATIC_PLUGIN(QPSQLDriverPlugin) -Q_EXPORT_PLUGIN2(qsqlpsql, QPSQLDriverPlugin) - QT_END_NAMESPACE + +#include "main.moc" diff --git a/src/plugins/sqldrivers/psql/psql.json b/src/plugins/sqldrivers/psql/psql.json new file mode 100644 index 0000000000..1579b99160 --- /dev/null +++ b/src/plugins/sqldrivers/psql/psql.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "QPSQL7", "QPSQL" ] +} diff --git a/src/plugins/sqldrivers/psql/psql.pro b/src/plugins/sqldrivers/psql/psql.pro index 8276c0ae90..cb0d27e171 100644 --- a/src/plugins/sqldrivers/psql/psql.pro +++ b/src/plugins/sqldrivers/psql/psql.pro @@ -1,6 +1,7 @@ TARGET = qsqlpsql SOURCES = main.cpp +OTHER_FILES += psql.json include(../../../sql/drivers/psql/qsql_psql.pri) include(../qsqldriverbase.pri) |