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/doc | |
| parent | b956fda0a1fa5813eb147e85ffc98e25d7177481 (diff) | |
| parent | 9dba73f30505ed7c220055788fba3cd201848fdb (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I3eec9a22565585d4fc40831d609a3083ce99a52c
Diffstat (limited to 'src/bluetooth/doc')
| -rw-r--r-- | src/bluetooth/doc/src/bluetooth-index.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/doc/src/bluetooth-index.qdoc b/src/bluetooth/doc/src/bluetooth-index.qdoc index f110179f..b168cd2d 100644 --- a/src/bluetooth/doc/src/bluetooth-index.qdoc +++ b/src/bluetooth/doc/src/bluetooth-index.qdoc @@ -35,7 +35,7 @@ The Bluetooth API provides connectivity between Bluetooth enabled devices. Currently, the API is supported on the following platforms: \l{Qt for Android}{Android}, \l{Qt for iOS}{iOS}, \l{Qt for Linux/X11}{Linux} -(\l{http://www.bluez.org}{BlueZ 4.x/5.x}) and \l{Qt for OS X}{OS X}. +(\l{http://www.bluez.org}{BlueZ 4.x/5.x}) and \l{Qt for macOS}{\macos}. \section1 Overview @@ -114,7 +114,7 @@ The \l QtBluetooth module exports the following \li Enables logging of the iOS implementation \row \li qt.bluetooth.osx - \li Enables logging of the OS X implementation + \li Enables logging of the \macos implementation \endtable \section2 Examples |