diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-05 08:09:00 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-05 08:09:00 (GMT) |
| commit | bb587db95d7c20344c0bf06a1f080c0a2e4a9250 (patch) | |
| tree | 50c4615c0c5908bb5a26c1a3ee121dd1f7f070be /src/network | |
| parent | f26f5b230e614faecce33cf52af0a0d62dcaddaa (diff) | |
| parent | 555018baf3115cb2587d2217bf1a5b8f49564ad2 (diff) | |
| download | Qt-bb587db95d7c20344c0bf06a1f080c0a2e4a9250.zip Qt-bb587db95d7c20344c0bf06a1f080c0a2e4a9250.tar.gz Qt-bb587db95d7c20344c0bf06a1f080c0a2e4a9250.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qauthenticator.cpp | 1 | ||||
| -rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 2 | ||||
| -rw-r--r-- | src/network/socket/qlocalsocket_win.cpp | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp index fa2b545..c6e5e55 100644 --- a/src/network/kernel/qauthenticator.cpp +++ b/src/network/kernel/qauthenticator.cpp @@ -46,6 +46,7 @@ #include <qbytearray.h> #include <qcryptographichash.h> #include <qhttp.h> +#include <qiodevice.h> #include <qdatastream.h> #include <qendian.h> #include <qstring.h> diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index fd3a85a..a5fd60e 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -324,7 +324,7 @@ QList<QNetworkProxy> QGlobalNetworkProxy::proxyForQuery(const QNetworkProxyQuery return result; } -Q_GLOBAL_STATIC(QGlobalNetworkProxy, globalNetworkProxy); +Q_GLOBAL_STATIC(QGlobalNetworkProxy, globalNetworkProxy) namespace { template<bool> struct StaticAssertTest; diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index 39c9284..ace3bc5 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -144,7 +144,7 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode) 0, // no sharing NULL, // default security attributes OPEN_EXISTING, // opens existing pipe - 0, // default attributes + FILE_FLAG_OVERLAPPED, NULL); // no template file }, { localSocket = CreateFileA( @@ -153,7 +153,7 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode) 0, // no sharing NULL, // default security attributes OPEN_EXISTING, // opens existing pipe - 0, // default attributes + FILE_FLAG_OVERLAPPED, NULL); // no template file }); if (localSocket != INVALID_HANDLE_VALUE) |