diff options
| author | Nico Vertriest <nico.vertriest@digia.com> | 2015-05-28 12:45:48 +0200 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@digia.com> | 2015-06-30 07:33:31 +0000 |
| commit | a7f2af09114cfa0996794c85bc48a601f665772d (patch) | |
| tree | a36d84d2026c90ba866954cb1ec7e4f7f7429ffe /src/network/socket | |
| parent | 592f355271df09c791682650a64ef42ffe898a27 (diff) | |
Replace MAC OS X with OS X
Task-number: QTBUG-46374
Change-Id: I7bc633ab551740bd328a24b0ccae1d534af47138
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 4 | ||||
| -rw-r--r-- | src/network/socket/qlocalserver.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index f5dcdcba1c..dfce0de865 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -420,7 +420,7 @@ allowed to rebind, even if they pass ReuseAddressHint. This option provides more security than ShareAddress, but on certain operating systems, it requires you to run the server with administrator privileges. - On Unix and Mac OS X, not sharing is the default behavior for binding + On Unix and OS X, not sharing is the default behavior for binding an address and port, so this option is ignored. On Windows, this option uses the SO_EXCLUSIVEADDRUSE socket option. @@ -430,7 +430,7 @@ socket option. On Unix, this option is ignored. \value DefaultForPlatform The default option for the current platform. - On Unix and Mac OS X, this is equivalent to (DontShareAddress + On Unix and OS X, this is equivalent to (DontShareAddress + ReuseAddressHint), and on Windows, its equivalent to ShareAddress. */ diff --git a/src/network/socket/qlocalserver.cpp b/src/network/socket/qlocalserver.cpp index 5854466704..0f49cb986e 100644 --- a/src/network/socket/qlocalserver.cpp +++ b/src/network/socket/qlocalserver.cpp @@ -141,7 +141,7 @@ QLocalServer::~QLocalServer() and are created based on the umask. Setting the access flags will overide this and will restrict or permit access as specified. - Other Unix-based operating systems, such as Mac OS X, do not + Other Unix-based operating systems, such as OS X, do not honor file permissions for Unix domain sockets and by default have WorldAccess and these permission flags will have no effect. |