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/sqlite2/smain.cpp | |
| 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/sqlite2/smain.cpp')
| -rw-r--r-- | src/plugins/sqldrivers/sqlite2/smain.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/sqldrivers/sqlite2/smain.cpp b/src/plugins/sqldrivers/sqlite2/smain.cpp index f16057c0a6..49cfd1cdfb 100644 --- a/src/plugins/sqldrivers/sqlite2/smain.cpp +++ b/src/plugins/sqldrivers/sqlite2/smain.cpp @@ -47,6 +47,9 @@ QT_BEGIN_NAMESPACE class QSQLite2DriverPlugin : public QSqlDriverPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QSqlDriverFactoryInterface" FILE "sqlite2.json") + public: QSQLite2DriverPlugin(); @@ -70,12 +73,9 @@ QSqlDriver* QSQLite2DriverPlugin::create(const QString &name) QStringList QSQLite2DriverPlugin::keys() const { - QStringList l; - l << QLatin1String("QSQLITE2"); - return l; + return QStringList(QStringLiteral("QSQLITE2")); } -Q_EXPORT_STATIC_PLUGIN(QSQLite2DriverPlugin) -Q_EXPORT_PLUGIN2(qsqlite2, QSQLite2DriverPlugin) - QT_END_NAMESPACE + +#include "smain.moc" |