From 08d32d1819d816ebc64124aeddf208ef2ecac1e3 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 29 Feb 2016 13:42:23 +0100 Subject: Purge sRGB chunks from PNGs in examples. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: I2b8810829f1b91033539229a6d4b3e505b8730ea Reviewed-by: Topi Reiniö --- examples/bluetooth/chat/images/clear.png | Bin 429 -> 320 bytes examples/bluetooth/chat/images/lineedit-bg.png | Bin 380 -> 217 bytes examples/nfc/corkboard/note-yellow.png | Bin 54559 -> 54283 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/examples/bluetooth/chat/images/clear.png b/examples/bluetooth/chat/images/clear.png index 91eb2706..c20a9cfb 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 7dbcc795..e0d93cd1 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/nfc/corkboard/note-yellow.png b/examples/nfc/corkboard/note-yellow.png index 8ddecc8b..3195952a 100644 Binary files a/examples/nfc/corkboard/note-yellow.png and b/examples/nfc/corkboard/note-yellow.png differ -- cgit v1.2.3 From cd151c723f6c7f3f41e4ccf0bbbf412a92a6747c Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 29 Feb 2016 13:42:23 +0100 Subject: Purge sRGB chunks from PNGs in documentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I621cb2437578c3f8a658e7c26a4de045825147ce Reviewed-by: Topi Reiniö --- .../doc/images/btfiletransfer-example.png | Bin 44606 -> 42755 bytes .../btscanner/doc/images/btscanner-example.png | Bin 76746 -> 73283 bytes .../heartlistener/doc/images/heartratefound.png | Bin 31606 -> 26494 bytes .../heartlistener/doc/images/heartrateresults.png | Bin 49402 -> 45087 bytes .../picturetransfer/doc/images/opp-example-1.png | Bin 152761 -> 152770 bytes .../picturetransfer/doc/images/opp-example-2.png | Bin 155969 -> 155839 bytes .../picturetransfer/doc/images/opp-example-3.png | Bin 169273 -> 169837 bytes .../bluetooth/scanner/doc/images/devicescan.png | Bin 43444 -> 37924 bytes .../bluetooth/scanner/doc/images/servicescan.png | Bin 91839 -> 80603 bytes .../nfc/annotatedurl/doc/images/annotatedurl.png | Bin 34341 -> 34705 bytes examples/nfc/ndefeditor/doc/images/ndefeditor.png | Bin 24500 -> 24397 bytes src/bluetooth/doc/images/peripheral-structure.png | Bin 74765 -> 74089 bytes 12 files changed, 0 insertions(+), 0 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 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 04fe9f3c..4a8f8f79 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/heartlistener/doc/images/heartratefound.png b/examples/bluetooth/heartlistener/doc/images/heartratefound.png index 68ff993d..89517aa4 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 6e2dfbca..8180d1a4 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 0b33bc8a..cf972277 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 d3d325d5..bc248284 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 cef9830c..de7231dc 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 e8503f5d..d75fdd0e 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 e9214d44..3a25c437 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 71739f50..b6cf8637 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/ndefeditor/doc/images/ndefeditor.png b/examples/nfc/ndefeditor/doc/images/ndefeditor.png index 0334dadf..9a5fbba7 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 a42c74da..55cdf16b 100644 Binary files a/src/bluetooth/doc/images/peripheral-structure.png and b/src/bluetooth/doc/images/peripheral-structure.png differ -- cgit v1.2.3 From 80b6557be3a23a5118ddf8c4b68bc28b66f52b49 Mon Sep 17 00:00:00 2001 From: Frank Meerkoetter Date: Mon, 21 Mar 2016 22:30:44 +0100 Subject: Spelling fix Change-Id: I4bcaa2d27d0ac4c9d3ed5fc3800392ba73e77a89 Reviewed-by: Alex Blasche --- src/bluetooth/qbluetoothhostinfo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bluetooth/qbluetoothhostinfo.cpp b/src/bluetooth/qbluetoothhostinfo.cpp index f3671695..1785390e 100644 --- a/src/bluetooth/qbluetoothhostinfo.cpp +++ b/src/bluetooth/qbluetoothhostinfo.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE */ /*! - Constrcuts a null QBluetoothHostInfo object. + Constructs a null QBluetoothHostInfo object. */ QBluetoothHostInfo::QBluetoothHostInfo() : d_ptr(new QBluetoothHostInfoPrivate) @@ -56,7 +56,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) -- cgit v1.2.3 From 1f83f647a62e6f0ee1fd5eaf3e48d28c3a4f01b4 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Mon, 4 Apr 2016 10:05:51 +0200 Subject: OSXBTCentralManager - fix details discovery (iOS/OS X) -serviceForUUID: fails to find included service and returns a nil for a valid service previously discovered. Task-number: QTBUG-52324 Change-Id: I9f4f8b1f3d3a78879344ace0170e23c03921d648 Reviewed-by: Alex Blasche --- src/bluetooth/osx/osxbtcentralmanager.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bluetooth/osx/osxbtcentralmanager.mm b/src/bluetooth/osx/osxbtcentralmanager.mm index f96da5c6..6afe03c0 100644 --- a/src/bluetooth/osx/osxbtcentralmanager.mm +++ b/src/bluetooth/osx/osxbtcentralmanager.mm @@ -873,7 +873,7 @@ QT_USE_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]; } -- cgit v1.2.3