diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-29 00:57:12 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-29 00:58:13 +0100 |
| commit | c4ad58ed2252d5ed9f448a5c068ab33dce4cadd9 (patch) | |
| tree | 7e9802171d7b4c641c2de1ef781023cab5d7d14c /src/plugins/bearer/networkmanager/main.cpp | |
| parent | 7da3a61b5fd5cc726f8fd62691aa5f84c7929800 (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Change-Id: I97ba222435ff50a9e5422e6f2c73e4bb8d1b865c
Diffstat (limited to 'src/plugins/bearer/networkmanager/main.cpp')
| -rw-r--r-- | src/plugins/bearer/networkmanager/main.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/bearer/networkmanager/main.cpp b/src/plugins/bearer/networkmanager/main.cpp index 2278d221fd..c8a8a74e46 100644 --- a/src/plugins/bearer/networkmanager/main.cpp +++ b/src/plugins/bearer/networkmanager/main.cpp @@ -52,6 +52,9 @@ QT_BEGIN_NAMESPACE class QNetworkManagerEnginePlugin : public QBearerEnginePlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "networkmanager.json") + public: QNetworkManagerEnginePlugin(); ~QNetworkManagerEnginePlugin(); @@ -86,10 +89,9 @@ QBearerEngine *QNetworkManagerEnginePlugin::create(const QString &key) const return 0; } -Q_EXPORT_STATIC_PLUGIN(QNetworkManagerEnginePlugin) -Q_EXPORT_PLUGIN2(qnmbearer, QNetworkManagerEnginePlugin) - QT_END_NAMESPACE +#include "main.moc" + #endif // QT_NO_DBUS #endif // QT_NO_BEARERMANAGEMENT |