Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: Ibd19c3d98438410ea0b25f80709137029c23983b

4 files changed, 10 insertions, 4 deletions

diff --git a/src/bluetooth/doc/src/bluetooth-index.qdoc b/src/bluetooth/doc/src/bluetooth-index.qdoc
index 9cb5f3b2..2a4f72bc 100644
--- a/src/bluetooth/doc/src/bluetooth-index.qdoc
+++ b/src/bluetooth/doc/src/bluetooth-index.qdoc
@@ -43,7 +43,7 @@ Currently, the API is supported on the following platforms:
     \li \l {Qt for Linux/X11}{Linux (BlueZ 4.x/5.x)}
     \li \l {Qt for OS X}{macOS}
     \li \l {Qt for WinRT}{WinRT}
-    \li \l {Qt for Windows}{Windows}
+    \li \l {Qt for Windows}{Win32}
 \row
     \li Classic Bluetooth
     \li x
@@ -78,6 +78,11 @@ Currently, the API is supported on the following platforms:
     \li
 \endtable
 
+Despite there not being a Win32 port yet, the WinRT backend is automatically used
+if the win32 target platform supports the required WinRT APIs. Minimal requirement is Windows 10 version 1507
+with slightly improved service discovery since Windows 10 version 1607. Therefore Windows 7 and 8.x
+targets are excluded.
+
 \section1 Overview
 
 Bluetooth is a short-range (less than 100 meters) wireless technology. It
diff --git a/src/bluetooth/qbluetoothlocaldevice.cpp b/src/bluetooth/qbluetoothlocaldevice.cpp
index e52dd88f..78095beb 100644
--- a/src/bluetooth/qbluetoothlocaldevice.cpp
+++ b/src/bluetooth/qbluetoothlocaldevice.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
     QBluetoothLocalDevice provides functions for getting and setting the state of local Bluetooth
     devices.
 
-    On iOS, this class cannot be used because the platform does not expose
+    On iOS and Windows, this class cannot be used because the platform does not expose
     any data or API which may provide information on the local Bluetooth device.
 */
 
diff --git a/src/bluetooth/qlowenergycontroller_bluez.cpp b/src/bluetooth/qlowenergycontroller_bluez.cpp
index c4ff0e7f..40519b51 100644
--- a/src/bluetooth/qlowenergycontroller_bluez.cpp
+++ b/src/bluetooth/qlowenergycontroller_bluez.cpp
@@ -796,6 +796,7 @@ void QLowEnergyControllerPrivateBluez::resetController()
     requestPending = false;
     encryptionChangePending = false;
     receivedMtuExchangeRequest = false;
+    mtuSize = ATT_DEFAULT_LE_MTU;
     securityLevelValue = -1;
     connectionHandle = 0;
 
diff --git a/src/bluetooth/qlowenergydescriptor.cpp b/src/bluetooth/qlowenergydescriptor.cpp
index 37a8f619..15859f17 100644
--- a/src/bluetooth/qlowenergydescriptor.cpp
+++ b/src/bluetooth/qlowenergydescriptor.cpp
@@ -54,14 +54,14 @@ QT_BEGIN_NAMESPACE
     QLowEnergyDescriptor provides information about a Bluetooth Low Energy
     descriptor's \l name(), \l uuid(), \l value() and \l handle(). Descriptors are
     encapsulated by Bluetooth Low Energy characteristics and provide additional
-    centextual information about the characteristic (data format, notification activation
+    contextual information about the characteristic (data format, notification activation
     and so on).
 
     The descriptor value may be written via the \l QLowEnergyService instance
     that manages the service to which this descriptor belongs. The
     \l {QLowEnergyService::writeDescriptor()} function writes the new value.
     The \l {QLowEnergyService::descriptorWritten()} signal
-    is emitted upon success. The cahced \l value() of this object is updated accordingly.
+    is emitted upon success. The cached \l value() of this object is updated accordingly.
 
     \sa QLowEnergyService, QLowEnergyCharacteristic
 */