diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-26 23:31:19 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-26 23:31:19 (GMT) |
| commit | 91ed93941cf698126e59c4efa57371c8c3c61c89 (patch) | |
| tree | fd0d82dcf06f369f28937e5573e30e4cbb8cddbd /src/plugins | |
| parent | a82fbee158bb117e5746fe097505d0a8035bb7d1 (diff) | |
| parent | ce1f282a5b061e4800735b2a39abfad1ee441e18 (diff) | |
| download | Qt-91ed93941cf698126e59c4efa57371c8c3c61c89.zip Qt-91ed93941cf698126e59c4efa57371c8c3c61c89.tar.gz Qt-91ed93941cf698126e59c4efa57371c8c3c61c89.tar.bz2 | |
Merge branch 'ares/mac/bearermanagement/integration' into bearermanagement/integration
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/corewlan/corewlan.pro | 8 | ||||
| -rw-r--r-- | src/plugins/bearer/corewlan/qcorewlanengine.h | 2 | ||||
| -rw-r--r-- | src/plugins/bearer/corewlan/qcorewlanengine.mm | 6 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro index ac04e95..1660215 100644 --- a/src/plugins/bearer/corewlan/corewlan.pro +++ b/src/plugins/bearer/corewlan/corewlan.pro @@ -11,8 +11,12 @@ contains(QT_CONFIG, corewlan) { } } -HEADERS += qcorewlanengine.h -SOURCES += qcorewlanengine.mm main.cpp +HEADERS += qcorewlanengine.h \ + ../qnetworksession_impl.h + +SOURCES += main.cpp \ + qcorewlanengine.mm \ + ../qnetworksession_impl.cpp QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.h b/src/plugins/bearer/corewlan/qcorewlanengine.h index dd07d83..8fedf4b 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine.h +++ b/src/plugins/bearer/corewlan/qcorewlanengine.h @@ -73,6 +73,8 @@ public: QNetworkConfigurationManager::Capabilities capabilities() const; + QNetworkSessionPrivate *createSessionBackend(); + static bool getAllScInterfaces(); private Q_SLOTS: diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm index 7ee0723..404edb4 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm +++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qcorewlanengine.h" +#include "../qnetworksession_impl.h" #include <QtNetwork/private/qnetworkconfiguration_p.h> @@ -517,4 +518,9 @@ QNetworkConfigurationManager::Capabilities QCoreWlanEngine::capabilities() const return QNetworkConfigurationManager::ForcedRoaming; } +QNetworkSessionPrivate *QCoreWlanEngine::createSessionBackend() +{ + return new QNetworkSessionPrivateImpl; +} + QT_END_NAMESPACE |