diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-12 05:15:58 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-12 05:15:58 (GMT) |
| commit | 65e0628bd0cdcb43226dad05582a97a6ef218124 (patch) | |
| tree | 67b8e04246f77bb3bcc76e31a5bccfb05061118f /src | |
| parent | e95391ab9e3930c05e76317d43c8f61476faf6ce (diff) | |
| parent | ddd65592cae3b1ec4ea64c721c44c3ac2fee4660 (diff) | |
| download | Qt-65e0628bd0cdcb43226dad05582a97a6ef218124.zip Qt-65e0628bd0cdcb43226dad05582a97a6ef218124.tar.gz Qt-65e0628bd0cdcb43226dad05582a97a6ef218124.tar.bz2 | |
Merge branch 'laptop/bearermanagement/integration' into bearermanagement/integration
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/access/qnetworkaccessbackend.cpp | 1 | ||||
| -rw-r--r-- | src/network/access/qnetworkaccessbackend_p.h | 1 | ||||
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 3 | ||||
| -rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 1 | ||||
| -rw-r--r-- | src/network/bearer/qnetworksession.h | 1 | ||||
| -rw-r--r-- | src/plugins/bearer/nla/nla.pro | 2 |
6 files changed, 5 insertions, 4 deletions
diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp index 1d23cdc..4441993 100644 --- a/src/network/access/qnetworkaccessbackend.cpp +++ b/src/network/access/qnetworkaccessbackend.cpp @@ -46,6 +46,7 @@ #include "qnetworkreply_p.h" #include "QtCore/qhash.h" #include "QtCore/qmutex.h" +#include "QtNetwork/qnetworksession.h" #include "qnetworkaccesscachebackend_p.h" #include "qabstractnetworkcache.h" diff --git a/src/network/access/qnetworkaccessbackend_p.h b/src/network/access/qnetworkaccessbackend_p.h index eab011c..9bc15e5 100644 --- a/src/network/access/qnetworkaccessbackend_p.h +++ b/src/network/access/qnetworkaccessbackend_p.h @@ -54,7 +54,6 @@ // #include "qnetworkreplyimpl_p.h" -#include "QtNetwork/qnetworksession.h" #include "QtCore/qobject.h" QT_BEGIN_NAMESPACE diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 312f744..bb5ff6c 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -47,6 +47,8 @@ #include "qnetworkcookie.h" #include "qabstractnetworkcache.h" +#include "QtNetwork/qnetworksession.h" + #include "qnetworkaccesshttpbackend_p.h" #include "qnetworkaccessftpbackend_p.h" #include "qnetworkaccessfilebackend_p.h" @@ -60,7 +62,6 @@ #include "QtNetwork/qauthenticator.h" #include "QtNetwork/qsslconfiguration.h" #include "QtNetwork/qnetworkconfigmanager.h" -#include "QtNetwork/qnetworksession.h" QT_BEGIN_NAMESPACE diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 2906caa..8951d08 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -46,6 +46,7 @@ #include "QtCore/qcoreapplication.h" #include "QtCore/qdatetime.h" #include "QtNetwork/qsslconfiguration.h" +#include "QtNetwork/qnetworksession.h" #include "qnetworkaccesshttpbackend_p.h" #include "qnetworkaccessmanager_p.h" diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h index 3c8d913..1c0dce0 100644 --- a/src/network/bearer/qnetworksession.h +++ b/src/network/bearer/qnetworksession.h @@ -43,7 +43,6 @@ #define QNETWORKSESSION_H #include <QtCore/qobject.h> -#include <QtCore/qshareddata.h> #include <QtCore/qstring.h> #include <QtNetwork/qnetworkinterface.h> #include <QtCore/qvariant.h> diff --git a/src/plugins/bearer/nla/nla.pro b/src/plugins/bearer/nla/nla.pro index 5ba171e..5148b09 100644 --- a/src/plugins/bearer/nla/nla.pro +++ b/src/plugins/bearer/nla/nla.pro @@ -12,7 +12,7 @@ QT += network HEADERS += qnlaengine.h \ ../platformdefs_win.h \ ../qnetworksession_impl.h \ - ../qbeaerengine_impl.h + ../qbearerengine_impl.h SOURCES += main.cpp \ qnlaengine.cpp \ |