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/mysql/main.cpp | 8 +++++--- src/plugins/sqldrivers/mysql/mysql.json | 3 +++ src/plugins/sqldrivers/mysql/mysql.pro | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 src/plugins/sqldrivers/mysql/mysql.json (limited to 'src/plugins/sqldrivers/mysql') diff --git a/src/plugins/sqldrivers/mysql/main.cpp b/src/plugins/sqldrivers/mysql/main.cpp index 86cae58701..70937218c3 100644 --- a/src/plugins/sqldrivers/mysql/main.cpp +++ b/src/plugins/sqldrivers/mysql/main.cpp @@ -47,6 +47,9 @@ QT_BEGIN_NAMESPACE class QMYSQLDriverPlugin : public QSqlDriverPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QSqlDriverFactoryInterface" FILE "mysql.json") + public: QMYSQLDriverPlugin(); @@ -76,7 +79,6 @@ QStringList QMYSQLDriverPlugin::keys() const return l; } -Q_EXPORT_STATIC_PLUGIN(QMYSQLDriverPlugin) -Q_EXPORT_PLUGIN2(qsqlmysql, QMYSQLDriverPlugin) - QT_END_NAMESPACE + +#include "main.moc" diff --git a/src/plugins/sqldrivers/mysql/mysql.json b/src/plugins/sqldrivers/mysql/mysql.json new file mode 100644 index 0000000000..0caaadb7ce --- /dev/null +++ b/src/plugins/sqldrivers/mysql/mysql.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "QMYSQL3", "QMYSQL" ] +} diff --git a/src/plugins/sqldrivers/mysql/mysql.pro b/src/plugins/sqldrivers/mysql/mysql.pro index b6d42fffc8..05d1073701 100644 --- a/src/plugins/sqldrivers/mysql/mysql.pro +++ b/src/plugins/sqldrivers/mysql/mysql.pro @@ -1,6 +1,7 @@ TARGET = qsqlmysql SOURCES = main.cpp +OTHER_FILES += mysql.json include(../../../sql/drivers/mysql/qsql_mysql.pri) include(../qsqldriverbase.pri) -- cgit v1.2.3