diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:05:20 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-18 13:37:59 +0200 |
| commit | 1d54177feb516a71fdb7af653ac62bee30eca753 (patch) | |
| tree | f9f879c2810f4695d0ba7f168ef93018936ba94e /src/nfc/doc/qtnfc.qdocconf | |
| parent | 37c770825c1174c274fd09b2da1a7438d8c0a363 (diff) | |
| parent | 1a645c5a9b7d8b3f2f1448a95a3f37eb2f0c5a5d (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/bluetooth/qlowenergycontroller_darwin.mm
src/bluetooth/qbluetoothdevicediscoveryagent_ios.mm
The latter was auto-resolved by keeping, but is in fact removed on dev, so reremoved.
Change-Id: Ifa47f61836450d59ea8e47a92b84f57ab06863f7
Diffstat (limited to 'src/nfc/doc/qtnfc.qdocconf')
| -rw-r--r-- | src/nfc/doc/qtnfc.qdocconf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nfc/doc/qtnfc.qdocconf b/src/nfc/doc/qtnfc.qdocconf index 61ed15b6..e4f10f0e 100644 --- a/src/nfc/doc/qtnfc.qdocconf +++ b/src/nfc/doc/qtnfc.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtconnectivity.qdocconf) project = QtNfc description = Qt NFC Reference Documentation |