summaryrefslogtreecommitdiffstats
path: root/src/network/socket/qabstractsocket.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2016-01-13 07:19:44 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-01-13 07:19:44 +0000
commit9a969182cfa452fdb305bc9fe0becc6b358f91c1 (patch)
tree9850ac418b869e42e17d82cc14d2fe0aa93a3192 /src/network/socket/qabstractsocket.cpp
parentf7020a31c02f4d1e5a46ce2ea20e38751f9afeed (diff)
parent6b8c0a50585bb637c5cd33ca8ffde0cb9c4e3664 (diff)
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/network/socket/qabstractsocket.cpp')
-rw-r--r--src/network/socket/qabstractsocket.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 913640e3e7..7b42f3eb14 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -426,8 +426,8 @@
\value ReuseAddressHint Provides a hint to QAbstractSocket that it should try
to rebind the service even if the address and port are already bound by
- another socket. On Windows, this is equivalent to the SO_REUSEADDR
- socket option. On Unix, this option is ignored.
+ another socket. On Windows and Unix, this is equivalent to the SO_REUSEADDR
+ socket option.
\value DefaultForPlatform The default option for the current platform.
On Unix and OS X, this is equivalent to (DontShareAddress