Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	examples/nfc/corkboard/corkboard.pro

Change-Id: I5d1ea0a8e21a1b55dbf744c2f4b469bc51f05c7a

1 files changed, 6 insertions, 3 deletions

diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp
index 3d9ab504..bc00aa95 100644
--- a/src/bluetooth/qbluetoothuuid.cpp
+++ b/src/bluetooth/qbluetoothuuid.cpp
@@ -608,9 +608,12 @@ QT_WARNING_POP
 }
 
 /*!
-    Constructs a new Bluetooth UUID from the \a uuid string.
-
-    The string must be in the form XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX.
+    Creates a QBluetoothUuid object from the string \a uuid,
+    which must be formatted as five hex fields separated by '-',
+    e.g., "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}" where 'x' is a hex digit.
+    The curly braces shown here are optional, but it is normal to include them.
+    If the conversion fails, a null UUID is created. See \l QUuid::toString() for an
+    explanation of how the five hex fields map to the public data members in QUuid.
 */
 QBluetoothUuid::QBluetoothUuid(const QString &uuid)
 :   QUuid(uuid)