diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-12 05:03:50 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-12 05:03:50 (GMT) |
| commit | c08afbfd96d7b8205fd2d0ff3e3e28f76aa3323f (patch) | |
| tree | a3e5cc203255b63c4946265406624025627fd2da /src/network | |
| parent | cc1268a6cbc9797e2a9137f7a0389f3d144a8c0a (diff) | |
| download | Qt-c08afbfd96d7b8205fd2d0ff3e3e28f76aa3323f.zip Qt-c08afbfd96d7b8205fd2d0ff3e3e28f76aa3323f.tar.gz Qt-c08afbfd96d7b8205fd2d0ff3e3e28f76aa3323f.tar.bz2 | |
Fix build on Windows.
On Windows interface is #defined to struct. Make sure that
qnetworksession.h is included before qplatformdefs.h.
Diffstat (limited to 'src/network')
| -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 |
5 files changed, 4 insertions, 3 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> |