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/generic | |
| 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/generic')
| -rw-r--r-- | src/plugins/bearer/generic/generic.json | 3 | ||||
| -rw-r--r-- | src/plugins/bearer/generic/generic.pro | 2 | ||||
| -rw-r--r-- | src/plugins/bearer/generic/main.cpp | 8 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/plugins/bearer/generic/generic.json b/src/plugins/bearer/generic/generic.json new file mode 100644 index 0000000000..e9357f4c72 --- /dev/null +++ b/src/plugins/bearer/generic/generic.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "generic" ] +} diff --git a/src/plugins/bearer/generic/generic.pro b/src/plugins/bearer/generic/generic.pro index 4f86c2a38c..e66c5b2c7a 100644 --- a/src/plugins/bearer/generic/generic.pro +++ b/src/plugins/bearer/generic/generic.pro @@ -11,6 +11,8 @@ SOURCES += qgenericengine.cpp \ ../qnetworksession_impl.cpp \ main.cpp +OTHER_FILES += generic.json + DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/src/plugins/bearer/generic/main.cpp b/src/plugins/bearer/generic/main.cpp index 0311bcbef0..5f5ad7c238 100644 --- a/src/plugins/bearer/generic/main.cpp +++ b/src/plugins/bearer/generic/main.cpp @@ -51,6 +51,9 @@ QT_BEGIN_NAMESPACE class QGenericEnginePlugin : public QBearerEnginePlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "generic.json") + public: QGenericEnginePlugin(); ~QGenericEnginePlugin(); @@ -80,9 +83,8 @@ QBearerEngine *QGenericEnginePlugin::create(const QString &key) const return 0; } -Q_EXPORT_STATIC_PLUGIN(QGenericEnginePlugin) -Q_EXPORT_PLUGIN2(qgenericbearer, QGenericEnginePlugin) - QT_END_NAMESPACE +#include "main.moc" + #endif // QT_NO_BEARERMANAGEMENT |