diff --git a/examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png b/examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png index f98241d6b30fff9da1b85f60adc3349ce0de946b..9485d6e8a4362694b4d55b5d55e2487cc791ff8d 100644 Binary files a/examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png and b/examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png differ diff --git a/examples/bluetooth/btscanner/doc/images/btscanner-example.png b/examples/bluetooth/btscanner/doc/images/btscanner-example.png index 04fe9f3cbb391a03fef2a6cfb930713bf2519a36..4a8f8f79a7a1521d381530816f2cb3083a5b8a03 100644 Binary files a/examples/bluetooth/btscanner/doc/images/btscanner-example.png and b/examples/bluetooth/btscanner/doc/images/btscanner-example.png differ diff --git a/examples/bluetooth/chat/images/clear.png b/examples/bluetooth/chat/images/clear.png index 91eb270695bfb9daa8db7982132fcfff9e59d17d..c20a9cfba50958e67ca11c1e59c74b6161ac3702 100644 Binary files a/examples/bluetooth/chat/images/clear.png and b/examples/bluetooth/chat/images/clear.png differ diff --git a/examples/bluetooth/chat/images/lineedit-bg.png b/examples/bluetooth/chat/images/lineedit-bg.png index 7dbcc795db896373cc6a18505fbf8d96421b2006..e0d93cd1cc7a8edb5be30314f9adf755dc80dc24 100644 Binary files a/examples/bluetooth/chat/images/lineedit-bg.png and b/examples/bluetooth/chat/images/lineedit-bg.png differ diff --git a/examples/bluetooth/heartlistener/doc/images/heartratefound.png b/examples/bluetooth/heartlistener/doc/images/heartratefound.png index 68ff993debbf9abd14f9939ac47f2222ec454669..89517aa4d3ebbc0e055d70187e5e42319f40170f 100644 Binary files a/examples/bluetooth/heartlistener/doc/images/heartratefound.png and b/examples/bluetooth/heartlistener/doc/images/heartratefound.png differ diff --git a/examples/bluetooth/heartlistener/doc/images/heartrateresults.png b/examples/bluetooth/heartlistener/doc/images/heartrateresults.png index 6e2dfbca179dea3dd446ae275f0ebeb8d8793c8e..8180d1a4f73ab29e6cd704b65cd43ada2697bfc9 100644 Binary files a/examples/bluetooth/heartlistener/doc/images/heartrateresults.png and b/examples/bluetooth/heartlistener/doc/images/heartrateresults.png differ diff --git a/examples/bluetooth/picturetransfer/doc/images/opp-example-1.png b/examples/bluetooth/picturetransfer/doc/images/opp-example-1.png index 0b33bc8ad504b0239bb54aa56bfeb8062bfd02bb..cf972277a95d3736c6882109de6cb1da8520fc6d 100644 Binary files a/examples/bluetooth/picturetransfer/doc/images/opp-example-1.png and b/examples/bluetooth/picturetransfer/doc/images/opp-example-1.png differ diff --git a/examples/bluetooth/picturetransfer/doc/images/opp-example-2.png b/examples/bluetooth/picturetransfer/doc/images/opp-example-2.png index d3d325d54ba18fca30dde07a56e4ccc06790969f..bc24828423404cbe2a2c08ba5c477b117ec80926 100644 Binary files a/examples/bluetooth/picturetransfer/doc/images/opp-example-2.png and b/examples/bluetooth/picturetransfer/doc/images/opp-example-2.png differ diff --git a/examples/bluetooth/picturetransfer/doc/images/opp-example-3.png b/examples/bluetooth/picturetransfer/doc/images/opp-example-3.png index cef9830c185fad29a4fe031ff1f3007b500d2650..de7231dc6b32c01a62beeabf9abb60799d6bd157 100644 Binary files a/examples/bluetooth/picturetransfer/doc/images/opp-example-3.png and b/examples/bluetooth/picturetransfer/doc/images/opp-example-3.png differ diff --git a/examples/bluetooth/scanner/doc/images/devicescan.png b/examples/bluetooth/scanner/doc/images/devicescan.png index e8503f5d352a91bdcdcf5c18998288303ceea605..d75fdd0ef9bc130e8819455502f1e6afd20b83bc 100644 Binary files a/examples/bluetooth/scanner/doc/images/devicescan.png and b/examples/bluetooth/scanner/doc/images/devicescan.png differ diff --git a/examples/bluetooth/scanner/doc/images/servicescan.png b/examples/bluetooth/scanner/doc/images/servicescan.png index e9214d44dc2affb29475598f4354e100ec5f896d..3a25c437a7cd592fd55e0b62b8c3be8b0ff91839 100644 Binary files a/examples/bluetooth/scanner/doc/images/servicescan.png and b/examples/bluetooth/scanner/doc/images/servicescan.png differ diff --git a/examples/nfc/annotatedurl/doc/images/annotatedurl.png b/examples/nfc/annotatedurl/doc/images/annotatedurl.png index 71739f5038a46368ed0dfec76f05ae2d56db6d12..b6cf8637cb75a89bfb522f314452dd5e99674081 100644 Binary files a/examples/nfc/annotatedurl/doc/images/annotatedurl.png and b/examples/nfc/annotatedurl/doc/images/annotatedurl.png differ diff --git a/examples/nfc/corkboard/note-yellow.png b/examples/nfc/corkboard/note-yellow.png index 8ddecc8b03d4c2151c6b73f890caab3ac4e4c220..3195952ad23d1a5099ea88979b3b1ae4baf426e1 100644 Binary files a/examples/nfc/corkboard/note-yellow.png and b/examples/nfc/corkboard/note-yellow.png differ diff --git a/examples/nfc/ndefeditor/doc/images/ndefeditor.png b/examples/nfc/ndefeditor/doc/images/ndefeditor.png index 0334dadf4b1c37faf39f9624975abcb0a9d8b115..9a5fbba7c21d8e6bdd3e3dc7fc0ac0554fdcf010 100644 Binary files a/examples/nfc/ndefeditor/doc/images/ndefeditor.png and b/examples/nfc/ndefeditor/doc/images/ndefeditor.png differ diff --git a/src/bluetooth/doc/images/peripheral-structure.png b/src/bluetooth/doc/images/peripheral-structure.png index a42c74da820b75bda294fefd025170715e120e85..55cdf16bd9b9e4362623dea5229674f134e64ba3 100644 Binary files a/src/bluetooth/doc/images/peripheral-structure.png and b/src/bluetooth/doc/images/peripheral-structure.png differ diff --git a/src/bluetooth/osx/osxbtcentralmanager.mm b/src/bluetooth/osx/osxbtcentralmanager.mm index 9e0451d2d2ad29434d873866c7a30ea73bea126b..62009845dbc5ced6fd9cfc5a05aa3d4ae8524d50 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 15a5cd5e5b8ab82a4477b1836bb85f9278d72a16..ca48fd23a1b01f5fb848d2ddd5936280ed5d3207 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)