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

Change-Id: I0ed4afd881f483a166a7e1400043f116c491f30c

8 files changed, 50 insertions, 3 deletions

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp
index 0d6c86f9..303dd67f 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp
@@ -225,6 +225,9 @@ void QBluetoothDeviceDiscoveryAgentPrivate::stop()
         return;
 
     if (m_active == SDPScanActive) {
+        if (pendingCancel)
+            return;
+
         pendingCancel = true;
         pendingStart = false;
         bool success = adapter.callMethod<jboolean>("cancelDiscovery");
diff --git a/src/bluetooth/qbluetoothserver_winrt.cpp b/src/bluetooth/qbluetoothserver_winrt.cpp
index 61134c1f..ddd71c21 100644
--- a/src/bluetooth/qbluetoothserver_winrt.cpp
+++ b/src/bluetooth/qbluetoothserver_winrt.cpp
@@ -217,6 +217,8 @@ bool QBluetoothServer::hasPendingConnections() const
 QBluetoothSocket *QBluetoothServer::nextPendingConnection()
 {
     Q_D(QBluetoothServer);
+    if (d->pendingConnections.count() == 0)
+        return nullptr;
 
     ComPtr<IStreamSocket> socket = d->pendingConnections.takeFirst();
 
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.cpp b/src/bluetooth/qbluetoothservicediscoveryagent.cpp
index 7daab4b7..d6163f0e 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent.cpp
@@ -450,6 +450,10 @@ void QBluetoothServiceDiscoveryAgentPrivate::startDeviceDiscovery()
 */
 void QBluetoothServiceDiscoveryAgentPrivate::stopDeviceDiscovery()
 {
+    // disconnect to avoid recursion during stop() - QTBUG-60131
+    // we don't care about a potential signals from device discovery agent anymore
+    deviceDiscoveryAgent->disconnect();
+
     deviceDiscoveryAgent->stop();
     delete deviceDiscoveryAgent;
     deviceDiscoveryAgent = 0;
@@ -497,6 +501,10 @@ void QBluetoothServiceDiscoveryAgentPrivate::_q_deviceDiscoveryError(QBluetoothD
     error = static_cast<QBluetoothServiceDiscoveryAgent::Error>(newError);
     errorString = deviceDiscoveryAgent->errorString();
 
+    // disconnect to avoid recursion during stop() - QTBUG-60131
+    // we don't care about a potential signals from device discovery agent anymore
+    deviceDiscoveryAgent->disconnect();
+
     deviceDiscoveryAgent->stop();
     delete deviceDiscoveryAgent;
     deviceDiscoveryAgent = 0;
diff --git a/src/bluetooth/qbluetoothserviceinfo.cpp b/src/bluetooth/qbluetoothserviceinfo.cpp
index d2920d78..e4e5d1ed 100644
--- a/src/bluetooth/qbluetoothserviceinfo.cpp
+++ b/src/bluetooth/qbluetoothserviceinfo.cpp
@@ -342,7 +342,7 @@ bool QBluetoothServiceInfo::unregisterService()
     Construct a new invalid QBluetoothServiceInfo;
 */
 QBluetoothServiceInfo::QBluetoothServiceInfo()
-    : d_ptr(QSharedPointer<QBluetoothServiceInfoPrivate>(new QBluetoothServiceInfoPrivate))
+    : d_ptr(QSharedPointer<QBluetoothServiceInfoPrivate>::create())
 {
 }
 
diff --git a/src/bluetooth/qbluetoothsocket_winrt.cpp b/src/bluetooth/qbluetoothsocket_winrt.cpp
index 4e2bc11c..365fe046 100644
--- a/src/bluetooth/qbluetoothsocket_winrt.cpp
+++ b/src/bluetooth/qbluetoothsocket_winrt.cpp
@@ -422,6 +422,9 @@ QString QBluetoothSocketPrivate::localName() const
 
 QBluetoothAddress QBluetoothSocketPrivate::localAddress() const
 {
+    if (!m_socketObject)
+        return QBluetoothAddress();
+
     HRESULT hr;
     ComPtr<IStreamSocketInformation> info;
     hr = m_socketObject->get_Information(&info);
@@ -437,6 +440,9 @@ QBluetoothAddress QBluetoothSocketPrivate::localAddress() const
 
 quint16 QBluetoothSocketPrivate::localPort() const
 {
+    if (!m_socketObject)
+        return 0;
+
     HRESULT hr;
     ComPtr<IStreamSocketInformation> info;
     hr = m_socketObject->get_Information(&info);
@@ -449,6 +455,9 @@ quint16 QBluetoothSocketPrivate::localPort() const
 
 QString QBluetoothSocketPrivate::peerName() const
 {
+    if (!m_socketObject)
+        return QString();
+
     HRESULT hr;
     ComPtr<IStreamSocketInformation> info;
     hr = m_socketObject->get_Information(&info);
@@ -464,6 +473,9 @@ QString QBluetoothSocketPrivate::peerName() const
 
 QBluetoothAddress QBluetoothSocketPrivate::peerAddress() const
 {
+    if (!m_socketObject)
+        return QBluetoothAddress();
+
     HRESULT hr;
     ComPtr<IStreamSocketInformation> info;
     hr = m_socketObject->get_Information(&info);
@@ -479,6 +491,9 @@ QBluetoothAddress QBluetoothSocketPrivate::peerAddress() const
 
 quint16 QBluetoothSocketPrivate::peerPort() const
 {
+    if (!m_socketObject)
+        return 0;
+
     HRESULT hr;
     ComPtr<IStreamSocketInformation> info;
     hr = m_socketObject->get_Information(&info);
diff --git a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp
index b4d472d0..fcba4c3a 100644
--- a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp
+++ b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp
@@ -270,10 +270,16 @@ void tst_QBluetoothLocalDevice::tst_isValid()
     QVERIFY(!invalidLocalDevice.isValid());
     QCOMPARE(invalidLocalDevice.address(), QBluetoothAddress());
     QCOMPARE(invalidLocalDevice.name(), QString());
+#ifndef Q_OS_WINRT
     QCOMPARE(invalidLocalDevice.pairingStatus(QBluetoothAddress()), QBluetoothLocalDevice::Unpaired );
     QCOMPARE(invalidLocalDevice.hostMode(), QBluetoothLocalDevice::HostPoweredOff);
-
+#else
+    // When QTBUG-62294 is fixed, the pairingStatus part is consistent across platforms
+    QCOMPARE(invalidLocalDevice.pairingStatus(QBluetoothAddress()), QBluetoothLocalDevice::Paired);
+    QCOMPARE(invalidLocalDevice.hostMode(), QBluetoothLocalDevice::HostConnectable);
+#endif
 }
+
 void tst_QBluetoothLocalDevice::tst_allDevices()
 {
     //nothing we can really test here
@@ -387,9 +393,16 @@ void tst_QBluetoothLocalDevice::tst_pairingStatus_data()
     QTest::addColumn<QBluetoothAddress>("deviceAddress");
     QTest::addColumn<QBluetoothLocalDevice::Pairing>("pairingExpected");
 
+#ifndef Q_OS_WINRT
     QTest::newRow("UnPaired Device: DUMMY") << QBluetoothAddress("11:00:00:00:00:00")
             << QBluetoothLocalDevice::Unpaired;
     QTest::newRow("Invalid device") << QBluetoothAddress() << QBluetoothLocalDevice::Unpaired;
+#else
+    // Remove special case when QTBUG-62294 is fixed
+    QTest::newRow("UnPaired Device: DUMMY") << QBluetoothAddress("11:00:00:00:00:00")
+        << QBluetoothLocalDevice::Paired;
+    QTest::newRow("Invalid device") << QBluetoothAddress() << QBluetoothLocalDevice::Paired;
+#endif
     //valid devices are already tested by tst_pairDevice()
 }
 
diff --git a/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp b/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp
index b6fd9211..2cb86fb4 100644
--- a/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp
+++ b/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp
@@ -217,7 +217,9 @@ void tst_QBluetoothServer::tst_receive()
 
     QVERIFY(result);
 
+#ifndef Q_OS_WINRT
     QVERIFY(QBluetoothLocalDevice::allDevices().count());
+#endif
     QCOMPARE(server.error(), QBluetoothServer::NoError);
     QCOMPARE(server.serverAddress(), address);
     QCOMPARE(server.serverPort(), quint16(20));
diff --git a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
index f5e1ec4b..c6fd83e6 100644
--- a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
+++ b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
@@ -117,9 +117,13 @@ tst_QLowEnergyController::~tst_QLowEnergyController()
 
 void tst_QLowEnergyController::initTestCase()
 {
-#if !defined(Q_OS_MAC) && !defined(Q_OS_WINRT)
+#if !defined(Q_OS_MAC)
     if (remoteDevice.isNull()
+#ifndef Q_OS_WINRT
         || QBluetoothLocalDevice::allDevices().isEmpty()) {
+#else
+        ) {
+#endif
         qWarning("No remote device or local adapter found.");
         return;
     }