diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:24:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:24:43 +0200 |
| commit | aabce3a08d1a65f8abc4872bd91a6dfd45cf7fd6 (patch) | |
| tree | 457dc8b600e0a4db7654708d921ef4ae398ae0d0 /src/bluetooth/qbluetoothserver.cpp | |
| parent | b956fda0a1fa5813eb147e85ffc98e25d7177481 (diff) | |
| parent | 9dba73f30505ed7c220055788fba3cd201848fdb (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I3eec9a22565585d4fc40831d609a3083ce99a52c
Diffstat (limited to 'src/bluetooth/qbluetoothserver.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothserver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothserver.cpp b/src/bluetooth/qbluetoothserver.cpp index f2a87bd4..a27eb385 100644 --- a/src/bluetooth/qbluetoothserver.cpp +++ b/src/bluetooth/qbluetoothserver.cpp @@ -286,7 +286,7 @@ int QBluetoothServer::maxPendingConnections() const \l QBluetooth::NoSecurity the server object will not employ any authentication or encryption. Any other security flag combination will trigger a secure Bluetooth connection. - On OS X, security flags are not supported and will be ignored. + On \macos, security flags are not supported and will be ignored. */ /*! |