Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1

Change-Id: I77d7b5877ce36057c3882a0b397ff27d5c35ad53

3 files changed, 3 insertions, 3 deletions

diff --git a/src/bluetooth/doc/images/peripheral-structure.png b/src/bluetooth/doc/images/peripheral-structure.png
index a42c74da..55cdf16b 100644
--- a/src/bluetooth/doc/images/peripheral-structure.png
+++ b/src/bluetooth/doc/images/peripheral-structure.png
diff --git a/src/bluetooth/osx/osxbtcentralmanager.mm b/src/bluetooth/osx/osxbtcentralmanager.mm
index 9e0451d2..62009845 100644
--- a/src/bluetooth/osx/osxbtcentralmanager.mm
+++ b/src/bluetooth/osx/osxbtcentralmanager.mm
@@ -878,7 +878,7 @@ QT_END_NAMESPACE
             CBService *const s = [toVisit objectAtIndex:i];
             if (equal_uuids(s.UUID, qtUuid))
                 return s;
-            if ([visitedNodes containsObject:s] && s.includedServices && s.includedServices.count) {
+            if (![visitedNodes containsObject:s] && s.includedServices && s.includedServices.count) {
                 [visitedNodes addObject:s];
                 [toVisitNext addObjectsFromArray:s.includedServices];
             }
diff --git a/src/bluetooth/qbluetoothhostinfo.cpp b/src/bluetooth/qbluetoothhostinfo.cpp
index 15a5cd5e..ca48fd23 100644
--- a/src/bluetooth/qbluetoothhostinfo.cpp
+++ b/src/bluetooth/qbluetoothhostinfo.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    Constrcuts a null QBluetoothHostInfo object.
+    Constructs a null QBluetoothHostInfo object.
 */
 QBluetoothHostInfo::QBluetoothHostInfo() :
     d_ptr(new QBluetoothHostInfoPrivate)
@@ -62,7 +62,7 @@ QBluetoothHostInfo::QBluetoothHostInfo() :
 }
 
 /*!
-    Constrcuts a new QBluetoothHostInfo which is a copy of \a other.
+    Constructs a new QBluetoothHostInfo which is a copy of \a other.
 */
 QBluetoothHostInfo::QBluetoothHostInfo(const QBluetoothHostInfo &other) :
     d_ptr(new QBluetoothHostInfoPrivate)