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

Conflicts:
	examples/nfc/corkboard/corkboard.pro

Change-Id: I5d1ea0a8e21a1b55dbf744c2f4b469bc51f05c7a

2 files changed, 2 insertions, 3 deletions

diff --git a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
index a8358dea..701e1825 100644
--- a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
+++ b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
@@ -611,8 +611,7 @@ void tst_QLowEnergyController::verifyServiceProperties(
         temp = QString("00002a02-0000-1000-8000-00805f9b34fb");
         QCOMPARE(chars[2].uuid(), QBluetoothUuid(temp));
         HANDLE_COMPARE(chars[2].handle(), QLowEnergyHandle(0x7));
-        QCOMPARE(chars[2].properties(),
-                 (QLowEnergyCharacteristic::Read|QLowEnergyCharacteristic::Write));
+        QVERIFY(chars[2].properties() & QLowEnergyCharacteristic::Read);
         QCOMPARE(chars[2].value(), QByteArray::fromHex("00"));
         QVERIFY(chars[2].isValid());
         QCOMPARE(chars[2].descriptors().count(), 0);
diff --git a/tests/bttestui/btlocaldevice.cpp b/tests/bttestui/btlocaldevice.cpp
index b2bcaf1d..5b84794c 100644
--- a/tests/bttestui/btlocaldevice.cpp
+++ b/tests/bttestui/btlocaldevice.cpp
@@ -411,7 +411,7 @@ void BtLocalDevice::connectToServiceViaSearch()
                 socket->setPreferredSecurityFlags(securityFlags);
 
             QBluetoothServiceInfo info = foundTestServers.at(0);
-            socket->connectToService(info.device().address(), QBluetoothUuid(QString(TEST_SERVICE_UUID)));
+            socket->connectToService(info);
         } else {
             qWarning() << "Perform search for test service before triggering this function";
         }