diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-23 13:13:29 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 22:38:15 +0100 |
| commit | 5f320e2f97df1ef48a7877feb418e3f63421b485 (patch) | |
| tree | f2366154991cdda47b1432a973706419092761dd /src/plugins/bearer/nla | |
| parent | b1995f2c96f90b20feb54a3368c2b8c2cfc1fa84 (diff) | |
Use new plugin system for network bearer plugins.
Change-Id: Ic4a28d379033518f75d0e3e449ddf012109ed9ea
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/plugins/bearer/nla')
| -rw-r--r-- | src/plugins/bearer/nla/main.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/bearer/nla/nla.json | 3 | ||||
| -rw-r--r-- | src/plugins/bearer/nla/nla.pro | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/plugins/bearer/nla/main.cpp b/src/plugins/bearer/nla/main.cpp index 4337c1748a..4a2c915d13 100644 --- a/src/plugins/bearer/nla/main.cpp +++ b/src/plugins/bearer/nla/main.cpp @@ -49,6 +49,9 @@ QT_BEGIN_NAMESPACE class QNlaEnginePlugin : public QBearerEnginePlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "nla.json") + public: QNlaEnginePlugin(); ~QNlaEnginePlugin(); @@ -78,7 +81,6 @@ QBearerEngine *QNlaEnginePlugin::create(const QString &key) const return 0; } -Q_EXPORT_STATIC_PLUGIN(QNlaEnginePlugin) -Q_EXPORT_PLUGIN2(qnlabearer, QNlaEnginePlugin) - QT_END_NAMESPACE + +#include "main.moc" diff --git a/src/plugins/bearer/nla/nla.json b/src/plugins/bearer/nla/nla.json new file mode 100644 index 0000000000..2554d2c5c4 --- /dev/null +++ b/src/plugins/bearer/nla/nla.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "nla" ] +} diff --git a/src/plugins/bearer/nla/nla.pro b/src/plugins/bearer/nla/nla.pro index 76da098dbf..5444269f1f 100644 --- a/src/plugins/bearer/nla/nla.pro +++ b/src/plugins/bearer/nla/nla.pro @@ -1,7 +1,7 @@ TARGET = qnlabearer load(qt_plugin) -QT = core network +QT = core core-private network network-private !wince* { LIBS += -lWs2_32 @@ -18,6 +18,8 @@ SOURCES += main.cpp \ qnlaengine.cpp \ ../qnetworksession_impl.cpp +OTHER_FILES += nla.json + DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target |