From a82fbee158bb117e5746fe097505d0a8035bb7d1 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Mon, 18 Jan 2010 16:01:05 +1000 Subject: Make compile on Windows. --- src/plugins/bearer/nativewifi/nativewifi.pro | 8 ++++++-- src/plugins/bearer/nativewifi/qnativewifiengine.cpp | 6 ++++++ src/plugins/bearer/nativewifi/qnativewifiengine.h | 2 ++ src/plugins/bearer/nla/nla.pro | 7 +++++-- src/plugins/bearer/nla/qnlaengine.cpp | 7 +++++++ src/plugins/bearer/nla/qnlaengine.h | 2 ++ 6 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/plugins/bearer/nativewifi/nativewifi.pro b/src/plugins/bearer/nativewifi/nativewifi.pro index 583edd4..6e99c62 100644 --- a/src/plugins/bearer/nativewifi/nativewifi.pro +++ b/src/plugins/bearer/nativewifi/nativewifi.pro @@ -3,8 +3,12 @@ include(../../qpluginbase.pri) QT += network -HEADERS += qnativewifiengine.h platformdefs.h -SOURCES += qnativewifiengine.cpp main.cpp +HEADERS += qnativewifiengine.h \ + platformdefs.h \ + ../qnetworksession_impl.h +SOURCES += main.cpp \ + qnativewifiengine.cpp \ + ../qnetworksession_impl.cpp QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp index 82ddaf9..1cd419b 100644 --- a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp +++ b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp @@ -41,6 +41,7 @@ #include "qnativewifiengine.h" #include "platformdefs.h" +#include "../qnetworksession_impl.h" #include @@ -467,4 +468,9 @@ QNetworkConfigurationManager::Capabilities QNativeWifiEngine::capabilities() con QNetworkConfigurationManager::CanStartAndStopInterfaces; } +QNetworkSessionPrivate *QNativeWifiEngine::createSessionBackend() +{ + return new QNetworkSessionPrivateImpl; +} + QT_END_NAMESPACE diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.h b/src/plugins/bearer/nativewifi/qnativewifiengine.h index 9d92562..39b6ea4 100644 --- a/src/plugins/bearer/nativewifi/qnativewifiengine.h +++ b/src/plugins/bearer/nativewifi/qnativewifiengine.h @@ -84,6 +84,8 @@ public: QNetworkConfigurationManager::Capabilities capabilities() const; + QNetworkSessionPrivate *createSessionBackend(); + inline bool available() const { return handle != 0; } public Q_SLOTS: diff --git a/src/plugins/bearer/nla/nla.pro b/src/plugins/bearer/nla/nla.pro index 62a920a..9bd3526 100644 --- a/src/plugins/bearer/nla/nla.pro +++ b/src/plugins/bearer/nla/nla.pro @@ -10,8 +10,11 @@ QT += network } HEADERS += qnlaengine.h \ - ../platformdefs_win.h -SOURCES += qnlaengine.cpp main.cpp + ../platformdefs_win.h \ + ../qnetworksession_impl.h +SOURCES += main.cpp \ + qnlaengine.cpp \ + ../qnetworksession_impl.cpp QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer diff --git a/src/plugins/bearer/nla/qnlaengine.cpp b/src/plugins/bearer/nla/qnlaengine.cpp index d3e3fd2..6c90429 100644 --- a/src/plugins/bearer/nla/qnlaengine.cpp +++ b/src/plugins/bearer/nla/qnlaengine.cpp @@ -40,6 +40,8 @@ ****************************************************************************/ #include "qnlaengine.h" +#include "../qnetworksession_impl.h" + #include #include @@ -636,6 +638,11 @@ QNetworkConfigurationManager::Capabilities QNlaEngine::capabilities() const return QNetworkConfigurationManager::ForcedRoaming; } +QNetworkSessionPrivate *QNlaEngine::createSessionBackend() +{ + return new QNetworkSessionPrivateImpl; +} + #include "qnlaengine.moc" QT_END_NAMESPACE diff --git a/src/plugins/bearer/nla/qnlaengine.h b/src/plugins/bearer/nla/qnlaengine.h index 5e80db1..5f0c294 100644 --- a/src/plugins/bearer/nla/qnlaengine.h +++ b/src/plugins/bearer/nla/qnlaengine.h @@ -95,6 +95,8 @@ public: QNetworkConfigurationManager::Capabilities capabilities() const; + QNetworkSessionPrivate *createSessionBackend(); + private Q_SLOTS: void networksChanged(); -- cgit v0.12