diff options
| author | Shane <shane.kearns@accenture.com> | 2012-03-14 13:18:20 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-15 18:05:05 +0100 |
| commit | 7046188bc6ec56048070f5dc0397d7b3dbbf40b3 (patch) | |
| tree | 2c685c89157e616bf947e81724ef1fa311f86ca4 /src/network | |
| parent | b1a8a39d78df374a90566e4f812e636a40e05bf7 (diff) | |
Fix QUdpSocket bindMode autotest regression
When binding with the DefaultForPlatform bindmode, then don't set
options on the socket related to sharability, leave them at the
platform default.
This restores compatiblity with Qt 4
Change-Id: I612a3acb976f08446b4eef03ccdcdf84b3477c3c
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 2 |
1 files changed, 2 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(); |