Merge remote-tracking branch 'origin/5.4.0' into 5.4

Change-Id: Ib79fe0b33b405cdf6fee87f97f6ebb86bb79d976

4 files changed, 108 insertions, 2 deletions

diff --git a/dist/changes-5.4.0 b/dist/changes-5.4.0
new file mode 100644
index 00000000..78809827
--- /dev/null
+++ b/dist/changes-5.4.0
@@ -0,0 +1,99 @@
+Qt 5.4 introduces many new features and improvements as well as bugfixes
+over the 5.3.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.4
+
+The Qt version 5.4 series is binary compatible with the 5.3.x series.
+Applications compiled for 5.3 will continue to run with 5.4.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+QtBluetooth
+-----------
+
+ - Bluetooth Low Energy Support added:
+   * Connect/disconnect to peripherals supported.
+   * Services on Peripheral can be discovered and interacted with.
+   * BlueZ on Linux is the only currently supported platform.
+     Minimal requirement are a Linux kernel v 3.5+ and BlueZ version 4.101+.
+     More platforms will be added by future Qt releases.
+   * The feature/API remains in Tech Preview stage throughout the Qt 5.4
+     release. Some API elements may still change in future releases.
+
+ - Fixed documentation throughout all classes.
+
+ - General:
+   * Bluetooth Low Energy scanner example has been added.
+   * Heart Listener Bluetooth Low Energy Heart Belt example has been added.
+
+ - QBluetoothAddress:
+   * QDebug streaming operator added.
+
+ - QBluetoothDeviceInfo:
+   * QBluetooth::CoreConfiguration enum added.
+   * CoreConfiguration attribute added.
+
+ - QBluetoothServiceDiscoveryAgent:
+   * Fixed cases where Bluez doesn't provide service names for given
+     Bluetooth service class uuid.
+
+ - QBLuetoothSocket:
+   * [QTBUG-32704] Fixed behavior of isReadable()/isOpen()/isWritable().
+     So far, these functions returned wrong values.
+
+ - QBluetoothTransferReply:
+   * QBluetoothTransferReply::error() signal added.
+   * QBluetoothTransferReply::SessionError value added to TransferError enum.
+   * QBluetoothTransferReply::TransferError enum declared as as meta type.
+   * Fixed a memory leak on Bluez and QNX.
+   * Fixed segmentation fault if passed QIODevice was 0.
+
+ - QBluetoothUuid:
+   * Added QBluetoothUuid::protocolToString(QBluetoothUuid::ProtocolUuid)
+     which returns a human-readable string for the given protocol uuid.
+   * Various Bluetooth Low Energy related API elements added. This includes
+     two new constructors, the DescriptorType and CharacteristicType enum,
+     various values for ServiceClassUuid enum and helper functions to
+     handle the extended range of new enums.
+
+QtNfc
+-----
+
+ - General:
+   * Fixed reference error bug in NFC poster example
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Android
+-------
+
+ - Fixed broken QBluetoothServer::isListening(). It returned false right
+   after a successful call to listen().
+
+Bluez/Linux
+-----------
+
+ - API ported to Bluez 5.x.
+
+ - Fixed license issue.
+
+ - QBluetoothDeviceDiscoveryAgent:
+   * Add support to enable detection of Bluetooth Low Energy devices.
+
+ - QBluetoothSocket:
+   * Fixed case where port L2CP port number was not converted to little-endian.
+     This bug affected big-endian platforms.
diff --git a/src/bluetooth/qbluetooth.cpp b/src/bluetooth/qbluetooth.cpp
index d418adc1..ea3900e1 100644
--- a/src/bluetooth/qbluetooth.cpp
+++ b/src/bluetooth/qbluetooth.cpp
@@ -72,6 +72,7 @@ namespace QBluetooth {
 /*!
     \typedef QLowEnergyHandle
     \relates QBluetooth
+    \since 5.4
 
     Typedef for Bluetooth Low Energy ATT attribute handles.
 */
diff --git a/src/bluetooth/qbluetoothtransferreply.cpp b/src/bluetooth/qbluetoothtransferreply.cpp
index 6c5c83a2..af1bf828 100644
--- a/src/bluetooth/qbluetoothtransferreply.cpp
+++ b/src/bluetooth/qbluetoothtransferreply.cpp
@@ -64,7 +64,8 @@ QT_BEGIN_NAMESPACE
     \value UserCanceledTransferError User terminated the transfer.
     \value IODeviceNotReadableError File was not open before initiating the sending command.
     \value ResourceBusyError Unable to access the resource..
-    \value SessionError      An error occurred during the handling of the session.
+    \value SessionError      An error occurred during the handling of the session. This enum was
+                             introduced by Qt 5.4.
 */
 
 
diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp
index 61798b03..1c8c0cf2 100644
--- a/src/bluetooth/qbluetoothuuid.cpp
+++ b/src/bluetooth/qbluetoothuuid.cpp
@@ -99,7 +99,8 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
     it can be used as a value for either of the above service attributes. Such a dual use has historical reasons
     but is no longer permissible for newer UUIDs.
 
-    The list below explicitly states as what type each UUID shall be used.
+    The list below explicitly states as what type each UUID shall be used. Bluetooth Low Energy related values
+    starting with 0x18 were introduced by Qt 5.4
 
     \value ServiceDiscoveryServer     Service discovery server UUID (service)
     \value BrowseGroupDescriptor      Browser group descriptor (service)
@@ -214,6 +215,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
 
 /*!
     \enum QBluetoothUuid::CharacteristicType
+    \since 5.4
 
     This enum is a convienience type for Bluetooth low energy service characteristics class UUIDs. Values of this type
     will be implicitly converted into a QBluetoothUuid when necessary.
@@ -369,6 +371,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
 
 /*!
     \enum QBluetoothUuid::DescriptorType
+    \since 5.4
 
     Descriptors are attributes that describe Bluetooth Low Energy characteristic values.
 
@@ -425,6 +428,7 @@ QBluetoothUuid::QBluetoothUuid(ServiceClassUuid uuid)
 
 /*!
     Constructs a new Bluetooth UUID from the characteristic type \a uuid.
+    \since 5.4
 */
 QBluetoothUuid::QBluetoothUuid(CharacteristicType uuid)
 :   QUuid(uuid, baseUuid()->data2, baseUuid()->data3, baseUuid()->data4[0], baseUuid()->data4[1],
@@ -435,6 +439,7 @@ QBluetoothUuid::QBluetoothUuid(CharacteristicType uuid)
 
 /*!
     Constructs a new Bluetooth UUID from the descriptor type \a uuid.
+    \since 5.4
 */
 QBluetoothUuid::QBluetoothUuid(DescriptorType uuid)
     :   QUuid(uuid, baseUuid()->data2, baseUuid()->data3, baseUuid()->data4[0], baseUuid()->data4[1],