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

src/bluetooth/doc/qtbluetooth.qdocconf

 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtconnectivity.qdocconf)
 
 project                 = QtBluetooth
 description             = Qt Bluetooth Reference Documentation

src/bluetooth/osx/osxbtperipheralmanager.mm

@@ -340,7 +340,7 @@ bool qt_validate_value_range(const QLowEnergyCharacteristicData &data)
 - (void)startAdvertising
 {
     state = PeripheralState::waitingForPowerOn;
-    if (manager)
+    if (manager.data())
         [manager setDelegate:nil];
     manager.reset([[CBPeripheralManager alloc] initWithDelegate:self
                    queue:OSXBluetooth::qt_LE_queue()]);
@@ -405,7 +405,7 @@ bool qt_validate_value_range(const QLowEnergyCharacteristicData &data)
 
 - (void) addServicesToPeripheral
 {
-    Q_ASSERT(manager);
+    Q_ASSERT(manager.data());
 
     if (nextServiceToAdd < services.size())
         [manager addService:services[nextServiceToAdd++]];

src/nfc/doc/qtnfc.qdocconf

 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtconnectivity.qdocconf)
 
 project                 = QtNfc
 description             = Qt NFC Reference Documentation