summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:22:51 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:22:51 +0200
commitf8759f683cfc433c432059e1160d2ab657baaec6 (patch)
tree0bd858d691a110aef42a420d1f3b8c499e4c0780 /examples
parentffbcf72ce353d1fb0568dbc87f5da344e4ccc690 (diff)
parent1f83f647a62e6f0ee1fd5eaf3e48d28c3a4f01b4 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Diffstat (limited to 'examples')
-rw-r--r--examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.pngbin44606 -> 42755 bytes
-rw-r--r--examples/bluetooth/btscanner/doc/images/btscanner-example.pngbin76746 -> 73283 bytes
-rw-r--r--examples/bluetooth/chat/images/clear.pngbin429 -> 320 bytes
-rw-r--r--examples/bluetooth/chat/images/lineedit-bg.pngbin380 -> 217 bytes
-rw-r--r--examples/bluetooth/heartlistener/doc/images/heartratefound.pngbin31606 -> 26494 bytes
-rw-r--r--examples/bluetooth/heartlistener/doc/images/heartrateresults.pngbin49402 -> 45087 bytes
-rw-r--r--examples/bluetooth/picturetransfer/doc/images/opp-example-1.pngbin152761 -> 152770 bytes
-rw-r--r--examples/bluetooth/picturetransfer/doc/images/opp-example-2.pngbin155969 -> 155839 bytes
-rw-r--r--examples/bluetooth/picturetransfer/doc/images/opp-example-3.pngbin169273 -> 169837 bytes
-rw-r--r--examples/bluetooth/scanner/doc/images/devicescan.pngbin43444 -> 37924 bytes
-rw-r--r--examples/bluetooth/scanner/doc/images/servicescan.pngbin91839 -> 80603 bytes
-rw-r--r--examples/nfc/annotatedurl/doc/images/annotatedurl.pngbin34341 -> 34705 bytes
-rw-r--r--examples/nfc/corkboard/note-yellow.pngbin54559 -> 54283 bytes
-rw-r--r--examples/nfc/ndefeditor/doc/images/ndefeditor.pngbin24500 -> 24397 bytes
14 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
--- a/examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png
+++ b/examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png
Binary files 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
--- a/examples/bluetooth/btscanner/doc/images/btscanner-example.png
+++ b/examples/bluetooth/btscanner/doc/images/btscanner-example.png
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files 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
--- a/examples/bluetooth/picturetransfer/doc/images/opp-example-1.png
+++ b/examples/bluetooth/picturetransfer/doc/images/opp-example-1.png
Binary files 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
--- a/examples/bluetooth/picturetransfer/doc/images/opp-example-2.png
+++ b/examples/bluetooth/picturetransfer/doc/images/opp-example-2.png
Binary files 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
--- a/examples/bluetooth/picturetransfer/doc/images/opp-example-3.png
+++ b/examples/bluetooth/picturetransfer/doc/images/opp-example-3.png
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ