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

Conflicts:
	.qmake.conf

Change-Id: I7a55929aefa1f7a4dc96f841317b78b248899f67

1 files changed, 1 insertions, 16 deletions

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp
index d8d68d4b..1aaaf0a4 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp
@@ -109,7 +109,6 @@ public slots:
 Q_SIGNALS:
     void deviceFound(const QBluetoothDeviceInfo &info);
     void scanFinished();
-    void scanCanceled();
 
 public:
     quint8 requestedModes;
@@ -250,10 +249,7 @@ void QWinRTBluetoothDeviceDiscoveryWorker::setupLEDeviceWatcher()
 
 void QWinRTBluetoothDeviceDiscoveryWorker::handleLeTimeout()
 {
-    if (m_pendingPairedDevices == 0)
-        emit scanFinished();
-    else
-        emit scanCanceled();
+    emit scanFinished();
     deleteLater();
 }
 
@@ -552,8 +548,6 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start(QBluetoothDeviceDiscoveryAgent
             this, &QBluetoothDeviceDiscoveryAgentPrivate::registerDevice);
     connect(worker, &QWinRTBluetoothDeviceDiscoveryWorker::scanFinished,
             this, &QBluetoothDeviceDiscoveryAgentPrivate::onScanFinished);
-    connect(worker, &QWinRTBluetoothDeviceDiscoveryWorker::scanCanceled,
-            this, &QBluetoothDeviceDiscoveryAgentPrivate::onScanCanceled);
     worker->start();
 
     if (lowEnergySearchTimeout > 0 && methods & QBluetoothDeviceDiscoveryAgent::LowEnergyMethod) { // otherwise no timeout and stop() required
@@ -613,21 +607,12 @@ void QBluetoothDeviceDiscoveryAgentPrivate::onScanFinished()
     emit q->finished();
 }
 
-void QBluetoothDeviceDiscoveryAgentPrivate::onScanCanceled()
-{
-    Q_Q(QBluetoothDeviceDiscoveryAgent);
-    disconnectAndClearWorker();
-    emit q->canceled();
-}
-
 void QBluetoothDeviceDiscoveryAgentPrivate::disconnectAndClearWorker()
 {
     Q_Q(QBluetoothDeviceDiscoveryAgent);
     if (!worker)
         return;
 
-    disconnect(worker, &QWinRTBluetoothDeviceDiscoveryWorker::scanCanceled,
-        this, &QBluetoothDeviceDiscoveryAgentPrivate::onScanCanceled);
     disconnect(worker, &QWinRTBluetoothDeviceDiscoveryWorker::scanFinished,
         this, &QBluetoothDeviceDiscoveryAgentPrivate::onScanFinished);
     disconnect(worker, &QWinRTBluetoothDeviceDiscoveryWorker::deviceFound,