diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /src/plugins/sqldrivers/db2 | |
parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'src/plugins/sqldrivers/db2')
-rw-r--r-- | src/plugins/sqldrivers/db2/db2.json | 3 | ||||
-rw-r--r-- | src/plugins/sqldrivers/db2/db2.pro | 1 | ||||
-rw-r--r-- | src/plugins/sqldrivers/db2/main.cpp | 12 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/plugins/sqldrivers/db2/db2.json b/src/plugins/sqldrivers/db2/db2.json new file mode 100644 index 0000000000..3f8678ae7a --- /dev/null +++ b/src/plugins/sqldrivers/db2/db2.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "QDB2" ] +} diff --git a/src/plugins/sqldrivers/db2/db2.pro b/src/plugins/sqldrivers/db2/db2.pro index e053f3756b..d04e6f191b 100644 --- a/src/plugins/sqldrivers/db2/db2.pro +++ b/src/plugins/sqldrivers/db2/db2.pro @@ -1,6 +1,7 @@ TARGET = qsqldb2 SOURCES = main.cpp +OTHER_FILES += db2.json include(../../../sql/drivers/db2/qsql_db2.pri) include(../qsqldriverbase.pri) diff --git a/src/plugins/sqldrivers/db2/main.cpp b/src/plugins/sqldrivers/db2/main.cpp index af5eb10c67..186eacf2e9 100644 --- a/src/plugins/sqldrivers/db2/main.cpp +++ b/src/plugins/sqldrivers/db2/main.cpp @@ -47,6 +47,9 @@ QT_BEGIN_NAMESPACE class QDB2DriverPlugin : public QSqlDriverPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QSqlDriverFactoryInterface" FILE "db2.json") + public: QDB2DriverPlugin(); @@ -70,12 +73,9 @@ QSqlDriver* QDB2DriverPlugin::create(const QString &name) QStringList QDB2DriverPlugin::keys() const { - QStringList l; - l.append(QLatin1String("QDB2")); - return l; + return QStringList(QStringLiteral("QDB2")); } -Q_EXPORT_STATIC_PLUGIN(QDB2DriverPlugin) -Q_EXPORT_PLUGIN2(qsqldb2, QDB2DriverPlugin) - QT_END_NAMESPACE + +#include "main.moc" |