diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2019-08-05 11:28:30 +0200 |
---|---|---|
committer | Oliver Wolff <oliver.wolff@qt.io> | 2019-08-12 08:09:19 +0200 |
commit | cfc5eaa6904354fc3084659691a6f28a51bf2269 (patch) | |
tree | da49c1c9717a03cdc2e69970ad4848e989e6bb8c /src/bluetooth/doc | |
parent | 8b7b52d66f2616040ca4aaae3f2732be96e19ab8 (diff) | |
parent | 99db6526341e6f0f2a4798088c1f954cff013b7b (diff) |
Merge "Merge remote-tracking branch 'origin/dev' into wip/win"
Diffstat (limited to 'src/bluetooth/doc')
-rw-r--r-- | src/bluetooth/doc/qtbluetooth.qdocconf | 1 | ||||
-rw-r--r-- | src/bluetooth/doc/src/bluetooth-index.qdoc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/bluetooth/doc/qtbluetooth.qdocconf b/src/bluetooth/doc/qtbluetooth.qdocconf index a994652b..9ee5a567 100644 --- a/src/bluetooth/doc/qtbluetooth.qdocconf +++ b/src/bluetooth/doc/qtbluetooth.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtconnectivity.qdocconf) project = QtBluetooth description = Qt Bluetooth Reference Documentation diff --git a/src/bluetooth/doc/src/bluetooth-index.qdoc b/src/bluetooth/doc/src/bluetooth-index.qdoc index 2a4f72bc..a0e2a048 100644 --- a/src/bluetooth/doc/src/bluetooth-index.qdoc +++ b/src/bluetooth/doc/src/bluetooth-index.qdoc @@ -41,7 +41,7 @@ Currently, the API is supported on the following platforms: \li \l {Qt for Android}{Android} \li \l {Qt for iOS}{iOS} \li \l {Qt for Linux/X11}{Linux (BlueZ 4.x/5.x)} - \li \l {Qt for OS X}{macOS} + \li \l \macos \li \l {Qt for WinRT}{WinRT} \li \l {Qt for Windows}{Win32} \row |