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

Conflicts:
	.qmake.conf

Change-Id: Ia9bc69bf68eb40ceb9bd5bd63d96ab4dece43c00

5 files changed, 65 insertions, 3 deletions

diff --git a/dist/changes-5.6.1 b/dist/changes-5.6.1
new file mode 100644
index 00000000..6535ae40
--- /dev/null
+++ b/dist/changes-5.6.1
@@ -0,0 +1,60 @@
+Qt 5.6.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.6.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://doc.qt.io/qt-5.6/
+
+The Qt version 5.6 series is binary compatible with the 5.5.x series.
+Applications compiled for 5.5 will continue to run with 5.6.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+QtBluetooth
+-----------
+
+ - Fixed various documentation issues.
+ - Improved QBluetoothServiceInfo QDebug operator.
+
+QtNfc
+-----
+
+ - [QTBUG-51860] Fixed crash related to incorrect QML import statement
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Android
+-------
+
+ - [QTBUG-52530] Added ACCESS_COURSE_LOCATION permission to QtBluetooth.
+   Android 6.0+ requires this type of permission for device discovery.
+ - [QTBUG-52154] Fixed Annotated URL example on Android. This Qt Nfc example
+   was not working due to missing Ndef message handler registration. The registration
+   is still not implemented but the example does not require it to properly work.
+
+iOS/OS X
+--------
+
+ - [QTBUG-52324] Fixed details discovery of included/secondary BTLE services
+   on iOS and OS X
+
+Linux/Bluez
+-----------
+
+ - [QTBUG-47593] Improved QBluetoothSocket's service discovery on Bluez 5. This
+   happened if the targeted serial service did not advertise a custom uuid and a minimal
+   service discovery was used to identify the serial port service. In such cases
+   QBluetoothSocket never found the remote service.
diff --git a/src/bluetooth/doc/qtbluetooth.qdocconf b/src/bluetooth/doc/qtbluetooth.qdocconf
index a4b86e95..52061d7e 100644
--- a/src/bluetooth/doc/qtbluetooth.qdocconf
+++ b/src/bluetooth/doc/qtbluetooth.qdocconf
@@ -4,7 +4,7 @@ project                 = QtBluetooth
 description             = Qt Bluetooth Reference Documentation
 version                 = $QT_VERSION
 
-examplesinstallpath     = qtconnectivity/bluetooth
+examplesinstallpath     = bluetooth
 
 qhp.projects            = QtBluetooth
 
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp
index d83731c2..b1cbdae5 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp
@@ -279,7 +279,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::startLowEnergyScan()
     if (!leScanTimeout) {
         leScanTimeout = new QTimer(this);
         leScanTimeout->setSingleShot(true);
-        leScanTimeout->setInterval(10000);
+        leScanTimeout->setInterval(25000);
         connect(leScanTimeout, &QTimer::timeout,
                 this, &QBluetoothDeviceDiscoveryAgentPrivate::stopLowEnergyScan);
     }
diff --git a/src/bluetooth/qbluetoothtransfermanager.cpp b/src/bluetooth/qbluetoothtransfermanager.cpp
index f4720564..7206dce6 100644
--- a/src/bluetooth/qbluetoothtransfermanager.cpp
+++ b/src/bluetooth/qbluetoothtransfermanager.cpp
@@ -45,8 +45,10 @@
 #elif QT_OSX_BLUETOOTH
 #include "qbluetoothtransferreply_osx_p.h"
 #else
+#if !defined(QT_ANDROID_BLUETOOTH) && !defined(QT_IOS_BLUETOOTH)
 #include "dummy/dummy_helper_p.h"
 #endif
+#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/nfc/doc/qtnfc.qdocconf b/src/nfc/doc/qtnfc.qdocconf
index 8b0ba092..61ed15b6 100644
--- a/src/nfc/doc/qtnfc.qdocconf
+++ b/src/nfc/doc/qtnfc.qdocconf
@@ -4,7 +4,7 @@ project                 = QtNfc
 description             = Qt NFC Reference Documentation
 version                 = $QT_VERSION
 
-examplesinstallpath     = qtconnectivity/nfc
+examplesinstallpath     = nfc
 
 qhp.projects            = QtNfc