summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer/networkmanager
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/bearer/networkmanager')
-rw-r--r--src/plugins/bearer/networkmanager/main.cpp8
-rw-r--r--src/plugins/bearer/networkmanager/networkmanager.json3
-rw-r--r--src/plugins/bearer/networkmanager/networkmanager.pro2
3 files changed, 10 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
diff --git a/src/plugins/bearer/networkmanager/networkmanager.json b/src/plugins/bearer/networkmanager/networkmanager.json
new file mode 100644
index 0000000000..3d408d5c20
--- /dev/null
+++ b/src/plugins/bearer/networkmanager/networkmanager.json
@@ -0,0 +1,3 @@
+{
+ "Keys": [ "networkmanager" ]
+}
diff --git a/src/plugins/bearer/networkmanager/networkmanager.pro b/src/plugins/bearer/networkmanager/networkmanager.pro
index 262f60a69c..c1c6664897 100644
--- a/src/plugins/bearer/networkmanager/networkmanager.pro
+++ b/src/plugins/bearer/networkmanager/networkmanager.pro
@@ -15,6 +15,8 @@ SOURCES += main.cpp \
qnetworkmanagerengine.cpp \
../qnetworksession_impl.cpp
+OTHER_FILES += networkmanager.json
+
DESTDIR = $$QT.network.plugins/bearer
target.path += $$[QT_INSTALL_PLUGINS]/bearer
INSTALLS += target