diff options
| author | Topi Reinio <topi.reinio@theqtcompany.com> | 2016-08-12 11:29:28 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@theqtcompany.com> | 2016-08-16 15:04:15 +0000 |
| commit | 95513185fd90cb9372a8cb8b541de7a3f41b12d4 (patch) | |
| tree | 3153106b3d50b0dccd7d1b678b3d9c3b6d1e016a /src/bluetooth/qbluetoothsocket.cpp | |
| parent | f5fe6ce47841be34d4b851725d80133ff6d14fee (diff) | |
Doc: Change instances of 'OS X' to 'macOS'
As of version 10.12 (Sierra), the name of Apple's desktop operating
system will be macOS. Change all occurrences where the platform is
discussed to use the macro \macos (defined in the documentation
configuration in qtbase).
Change-Id: I97f7a0d6d2ca351395bed518f01d4365b986500a
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Diffstat (limited to 'src/bluetooth/qbluetoothsocket.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothsocket.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp index 7adb56b4..2b2264e8 100644 --- a/src/bluetooth/qbluetoothsocket.cpp +++ b/src/bluetooth/qbluetoothsocket.cpp @@ -201,7 +201,7 @@ Q_DECLARE_LOGGING_CATEGORY(QT_BT) Although some platforms may differ the socket must generally be connected to guarantee the return of a valid port number. - On Android and OS X, this feature is not supported and returns 0. + On Android and \macos, this feature is not supported and returns 0. */ /*! @@ -498,7 +498,7 @@ QString QBluetoothSocket::errorString() const On Bluez this property is set to QBluetooth::Authorization by default. - On OS X, this value is ignored as the platform does not permit access + On \macos, this value is ignored as the platform does not permit access to the security parameter of the socket. By default the platform prefers secure/encrypted connections though and therefore this function always returns \l QBluetooth::Secure. @@ -532,7 +532,7 @@ void QBluetoothSocket::setPreferredSecurityFlags(QBluetooth::SecurityFlags flags during or after the connection has been established. If such a change happens it is not reflected in the value of this flag. - On OS X, this flag is always set to \l QBluetooth::Secure. + On \macos, this flag is always set to \l QBluetooth::Secure. \sa setPreferredSecurityFlags() |