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

Conflicts:
	.qmake.conf

Change-Id: Ia9bc69bf68eb40ceb9bd5bd63d96ab4dece43c00

1 files changed, 1 insertions, 1 deletions

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);
     }