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/bearer/nativewifi/main.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/bearer/nativewifi/main.cpp')
| -rw-r--r-- | src/plugins/bearer/nativewifi/main.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/bearer/nativewifi/main.cpp b/src/plugins/bearer/nativewifi/main.cpp index 74129c1d0a..8baa977a9d 100644 --- a/src/plugins/bearer/nativewifi/main.cpp +++ b/src/plugins/bearer/nativewifi/main.cpp @@ -92,6 +92,9 @@ static void resolveLibrary() class QNativeWifiEnginePlugin : public QBearerEnginePlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "nativewifi.json") + public: QNativeWifiEnginePlugin(); ~QNativeWifiEnginePlugin(); @@ -135,9 +138,8 @@ QBearerEngine *QNativeWifiEnginePlugin::create(const QString &key) const return engine; } -Q_EXPORT_STATIC_PLUGIN(QNativeWifiEnginePlugin) -Q_EXPORT_PLUGIN2(qnativewifibearer, QNativeWifiEnginePlugin) - QT_END_NAMESPACE +#include "main.moc" + #endif // QT_NO_BEARERMANAGEMENT |