AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use new plugin system for network bearer plugins.

Browse Source 
Change-Id: Ic4a28d379033518f75d0e3e449ddf012109ed9ea
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Friedemann Kleint 2012-02-23 13:13:29 +01:00 committed by Qt by Nokia
parent b1995f2c96
commit 5f320e2f97
18 changed files with 61 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/bearer/connman/connman.json Normal file
View File

@ -0,0 +1,3 @@
{
"Keys": [ "connman" ]
}

2
src/plugins/bearer/connman/connman.pro
View File

@ -15,6 +15,8 @@ SOURCES += main.cpp \
qconnmanengine.cpp \
../qnetworksession_impl.cpp
OTHER_FILES += connman.json
DESTDIR = $$QT.network.plugins/bearer
target.path += $$[QT_INSTALL_PLUGINS]/bearer
INSTALLS += target

8
src/plugins/bearer/connman/main.cpp
View File

@ -51,6 +51,9 @@ QT_BEGIN_NAMESPACE
class QConnmanEnginePlugin : public QBearerEnginePlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "connman.json")
public:
QConnmanEnginePlugin();
~QConnmanEnginePlugin();
@ -84,10 +87,9 @@ QBearerEngine *QConnmanEnginePlugin::create(const QString &key) const
return 0;
}
Q_EXPORT_STATIC_PLUGIN(QConnmanEnginePlugin)
Q_EXPORT_PLUGIN2(qconnmanbearer, QConnmanEnginePlugin)
QT_END_NAMESPACE
#include "main.moc"
#endif
#endif // QT_NO_BEARERMANAGEMENT

3
src/plugins/bearer/corewlan/corewlan.json Normal file
View File

@ -0,0 +1,3 @@
{
"Keys": [ "corewlan" ]
}

2
src/plugins/bearer/corewlan/corewlan.pro
View File

@ -19,6 +19,8 @@ SOURCES += main.cpp \
OBJECTIVE_SOURCES += qcorewlanengine.mm
OTHER_FILES += corewlan.json
DESTDIR = $$QT.network.plugins/bearer
target.path += $$[QT_INSTALL_PLUGINS]/bearer
INSTALLS += target

8
src/plugins/bearer/corewlan/main.cpp
View File

@ -51,6 +51,9 @@ QT_BEGIN_NAMESPACE
class QCoreWlanEnginePlugin : public QBearerEnginePlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "corewlan.json")
public:
QCoreWlanEnginePlugin();
~QCoreWlanEnginePlugin();
@ -80,9 +83,8 @@ QBearerEngine *QCoreWlanEnginePlugin::create(const QString &key) const
return 0;
}
Q_EXPORT_STATIC_PLUGIN(QCoreWlanEnginePlugin)
Q_EXPORT_PLUGIN2(qcorewlanbearer, QCoreWlanEnginePlugin)
QT_END_NAMESPACE
#include "main.moc"
#endif // QT_NO_BEARERMANAGEMENT

3
src/plugins/bearer/generic/generic.json Normal file
View File

@ -0,0 +1,3 @@
{
"Keys": [ "generic" ]
}

2
src/plugins/bearer/generic/generic.pro
View File

@ -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

8
src/plugins/bearer/generic/main.cpp
View File

@ -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

8
src/plugins/bearer/nativewifi/main.cpp
View File

@ -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

3
src/plugins/bearer/nativewifi/nativewifi.json Normal file
View File

@ -0,0 +1,3 @@
{
"Keys": [ "nativewifi" ]
}

2
src/plugins/bearer/nativewifi/nativewifi.pro
View File

@ -12,6 +12,8 @@ SOURCES += main.cpp \
qnativewifiengine.cpp \
../qnetworksession_impl.cpp
OTHER_FILES += nativewifi.json
DESTDIR = $$QT.network.plugins/bearer
target.path += $$[QT_INSTALL_PLUGINS]/bearer
INSTALLS += target

8
src/plugins/bearer/networkmanager/main.cpp
View File

@ -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

3
src/plugins/bearer/networkmanager/networkmanager.json Normal file
View File

@ -0,0 +1,3 @@
{
"Keys": [ "networkmanager" ]
}

2
src/plugins/bearer/networkmanager/networkmanager.pro
View File

@ -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

8
src/plugins/bearer/nla/main.cpp
View File

@ -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"

3
src/plugins/bearer/nla/nla.json Normal file
View File

@ -0,0 +1,3 @@
{
"Keys": [ "nla" ]
}

4
src/plugins/bearer/nla/nla.pro
View File

@ -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