diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
| commit | 440f452aa3a5609e5f6006a03ac36d41462d5908 (patch) | |
| tree | 598d682291945055e4f6feb08a228212648482c1 /src/network/socket | |
| parent | cd1e62ffc121cc68c5a133a8095d431f04d966ce (diff) | |
| parent | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro
Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 2 | ||||
| -rw-r--r-- | src/network/socket/socket.pri | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 2f66671530..af22b20b21 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -1457,6 +1457,7 @@ bool QAbstractSocket::bind(const QHostAddress &address, quint16 port, BindMode m return false; } + if (mode != DefaultForPlatform) { #ifdef Q_OS_UNIX if ((mode & ShareAddress) || (mode & ReuseAddressHint)) d->socketEngine->setOption(QAbstractSocketEngine::AddressReusable, 1); @@ -1473,6 +1474,7 @@ bool QAbstractSocket::bind(const QHostAddress &address, quint16 port, BindMode m else d->socketEngine->setOption(QAbstractSocketEngine::BindExclusively, 0); #endif + } bool result = d->socketEngine->bind(address, port); d->cachedSocketDescriptor = d->socketEngine->socketDescriptor(); diff --git a/src/network/socket/socket.pri b/src/network/socket/socket.pri index 48c38a209e..8f93f0d0c0 100644 --- a/src/network/socket/socket.pri +++ b/src/network/socket/socket.pri @@ -8,6 +8,7 @@ HEADERS += socket/qabstractsocketengine_p.h \ socket/qtcpsocket.h \ socket/qudpsocket.h \ socket/qtcpserver.h \ + socket/qtcpsocket_p.h \ socket/qlocalserver.h \ socket/qlocalserver_p.h \ socket/qlocalsocket.h \ |