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

Change-Id: I77d7b5877ce36057c3882a0b397ff27d5c35ad53

17 files changed, 3 insertions, 3 deletions

diff --git a/examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png b/examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png
index f98241d6..9485d6e8 100644
--- a/examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png
+++ b/examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png
diff --git a/examples/bluetooth/btscanner/doc/images/btscanner-example.png b/examples/bluetooth/btscanner/doc/images/btscanner-example.png
index 04fe9f3c..4a8f8f79 100644
--- a/examples/bluetooth/btscanner/doc/images/btscanner-example.png
+++ b/examples/bluetooth/btscanner/doc/images/btscanner-example.png
diff --git a/examples/bluetooth/chat/images/clear.png b/examples/bluetooth/chat/images/clear.png
index 91eb2706..c20a9cfb 100644
--- a/examples/bluetooth/chat/images/clear.png
+++ b/examples/bluetooth/chat/images/clear.png
diff --git a/examples/bluetooth/chat/images/lineedit-bg.png b/examples/bluetooth/chat/images/lineedit-bg.png
index 7dbcc795..e0d93cd1 100644
--- a/examples/bluetooth/chat/images/lineedit-bg.png
+++ b/examples/bluetooth/chat/images/lineedit-bg.png
diff --git a/examples/bluetooth/heartlistener/doc/images/heartratefound.png b/examples/bluetooth/heartlistener/doc/images/heartratefound.png
index 68ff993d..89517aa4 100644
--- a/examples/bluetooth/heartlistener/doc/images/heartratefound.png
+++ b/examples/bluetooth/heartlistener/doc/images/heartratefound.png
diff --git a/examples/bluetooth/heartlistener/doc/images/heartrateresults.png b/examples/bluetooth/heartlistener/doc/images/heartrateresults.png
index 6e2dfbca..8180d1a4 100644
--- a/examples/bluetooth/heartlistener/doc/images/heartrateresults.png
+++ b/examples/bluetooth/heartlistener/doc/images/heartrateresults.png
diff --git a/examples/bluetooth/picturetransfer/doc/images/opp-example-1.png b/examples/bluetooth/picturetransfer/doc/images/opp-example-1.png
index 0b33bc8a..cf972277 100644
--- a/examples/bluetooth/picturetransfer/doc/images/opp-example-1.png
+++ b/examples/bluetooth/picturetransfer/doc/images/opp-example-1.png
diff --git a/examples/bluetooth/picturetransfer/doc/images/opp-example-2.png b/examples/bluetooth/picturetransfer/doc/images/opp-example-2.png
index d3d325d5..bc248284 100644
--- a/examples/bluetooth/picturetransfer/doc/images/opp-example-2.png
+++ b/examples/bluetooth/picturetransfer/doc/images/opp-example-2.png
diff --git a/examples/bluetooth/picturetransfer/doc/images/opp-example-3.png b/examples/bluetooth/picturetransfer/doc/images/opp-example-3.png
index cef9830c..de7231dc 100644
--- a/examples/bluetooth/picturetransfer/doc/images/opp-example-3.png
+++ b/examples/bluetooth/picturetransfer/doc/images/opp-example-3.png
diff --git a/examples/bluetooth/scanner/doc/images/devicescan.png b/examples/bluetooth/scanner/doc/images/devicescan.png
index e8503f5d..d75fdd0e 100644
--- a/examples/bluetooth/scanner/doc/images/devicescan.png
+++ b/examples/bluetooth/scanner/doc/images/devicescan.png
diff --git a/examples/bluetooth/scanner/doc/images/servicescan.png b/examples/bluetooth/scanner/doc/images/servicescan.png
index e9214d44..3a25c437 100644
--- a/examples/bluetooth/scanner/doc/images/servicescan.png
+++ b/examples/bluetooth/scanner/doc/images/servicescan.png
diff --git a/examples/nfc/annotatedurl/doc/images/annotatedurl.png b/examples/nfc/annotatedurl/doc/images/annotatedurl.png
index 71739f50..b6cf8637 100644
--- a/examples/nfc/annotatedurl/doc/images/annotatedurl.png
+++ b/examples/nfc/annotatedurl/doc/images/annotatedurl.png
diff --git a/examples/nfc/corkboard/note-yellow.png b/examples/nfc/corkboard/note-yellow.png
index 8ddecc8b..3195952a 100644
--- a/examples/nfc/corkboard/note-yellow.png
+++ b/examples/nfc/corkboard/note-yellow.png
diff --git a/examples/nfc/ndefeditor/doc/images/ndefeditor.png b/examples/nfc/ndefeditor/doc/images/ndefeditor.png
index 0334dadf..9a5fbba7 100644
--- a/examples/nfc/ndefeditor/doc/images/ndefeditor.png
+++ b/examples/nfc/ndefeditor/doc/images/ndefeditor.png
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)