summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-01-20 01:01:04 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-01-20 01:01:04 (GMT)
commitce1f282a5b061e4800735b2a39abfad1ee441e18 (patch)
tree6ecb1b30f8fc2e2f0b36844a0e1fbeaee5ff2b3e
parent35c7808149558d9798d158605fbd835ea167ca53 (diff)
downloadQt-ce1f282a5b061e4800735b2a39abfad1ee441e18.zip
Qt-ce1f282a5b061e4800735b2a39abfad1ee441e18.tar.gz
Qt-ce1f282a5b061e4800735b2a39abfad1ee441e18.tar.bz2
Make compile on Mac OS X.
-rw-r--r--src/plugins/bearer/corewlan/corewlan.pro8
-rw-r--r--src/plugins/bearer/corewlan/qcorewlanengine.h2
-rw-r--r--src/plugins/bearer/corewlan/qcorewlanengine.mm6
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