diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:29:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:29:44 +0100 |
| commit | f8e256271f919c36c8d97eae27b1d11678294e70 (patch) | |
| tree | 774152d663a540dbf0ceb2f1ccb8385842a6e471 /examples | |
| parent | 5cf1a2f7f4ac4e71b085ef53ff5a05c4676f7ce2 (diff) | |
| parent | 1e42bf9e28ee0578277047735a5be24fc68abb2c (diff) | |
| download | qtsensors-f8e256271f919c36c8d97eae27b1d11678294e70.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/sensors/doc/src/compatmap.qdoc
Change-Id: I7bd464cbd506f630798091fef3896050ade7b3f8
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/sensors/accelbubble/doc/images/accelbubble.png | bin | 5181 -> 5025 bytes |
| -rw-r--r-- | examples/sensors/grue/doc/images/qtsensors-examples-grue.png | bin | 12278 -> 7511 bytes |
| -rw-r--r-- | examples/sensors/grue/grue.png | bin | 11207 -> 9319 bytes |
| -rw-r--r-- | examples/sensors/maze/components/images/button_background_pressed.png | bin | 334 -> 228 bytes |
| -rw-r--r-- | examples/sensors/maze/content/00.png | bin | 186 -> 70 bytes |
| -rw-r--r-- | examples/sensors/maze/content/01.png | bin | 708 -> 540 bytes |
| -rw-r--r-- | examples/sensors/maze/content/cheese.png | bin | 317 -> 156 bytes |
| -rw-r--r-- | examples/sensors/maze/content/start.png | bin | 677 -> 505 bytes |
| -rw-r--r-- | examples/sensors/qmlqtsensors/components/images/button_background_pressed.png | bin | 334 -> 228 bytes |
| -rw-r--r-- | examples/sensors/sensor_explorer/doc/images/qtsensors-examples-explorer.png | bin | 39873 -> 39820 bytes |
10 files changed, 0 insertions, 0 deletions
diff --git a/examples/sensors/accelbubble/doc/images/accelbubble.png b/examples/sensors/accelbubble/doc/images/accelbubble.png Binary files differindex 84e876d..ad4cfc0 100644 --- a/examples/sensors/accelbubble/doc/images/accelbubble.png +++ b/examples/sensors/accelbubble/doc/images/accelbubble.png diff --git a/examples/sensors/grue/doc/images/qtsensors-examples-grue.png b/examples/sensors/grue/doc/images/qtsensors-examples-grue.png Binary files differindex 81b3725..f434827 100644 --- a/examples/sensors/grue/doc/images/qtsensors-examples-grue.png +++ b/examples/sensors/grue/doc/images/qtsensors-examples-grue.png diff --git a/examples/sensors/grue/grue.png b/examples/sensors/grue/grue.png Binary files differindex f0b070b..2727d39 100644 --- a/examples/sensors/grue/grue.png +++ b/examples/sensors/grue/grue.png diff --git a/examples/sensors/maze/components/images/button_background_pressed.png b/examples/sensors/maze/components/images/button_background_pressed.png Binary files differindex 149529e..e0ba0e7 100644 --- a/examples/sensors/maze/components/images/button_background_pressed.png +++ b/examples/sensors/maze/components/images/button_background_pressed.png diff --git a/examples/sensors/maze/content/00.png b/examples/sensors/maze/content/00.png Binary files differindex ab29a62..2522be5 100644 --- a/examples/sensors/maze/content/00.png +++ b/examples/sensors/maze/content/00.png diff --git a/examples/sensors/maze/content/01.png b/examples/sensors/maze/content/01.png Binary files differindex 0e70d1b..6146b20 100644 --- a/examples/sensors/maze/content/01.png +++ b/examples/sensors/maze/content/01.png diff --git a/examples/sensors/maze/content/cheese.png b/examples/sensors/maze/content/cheese.png Binary files differindex ecef450..c737b9d 100644 --- a/examples/sensors/maze/content/cheese.png +++ b/examples/sensors/maze/content/cheese.png diff --git a/examples/sensors/maze/content/start.png b/examples/sensors/maze/content/start.png Binary files differindex 698c0b1..581b8c9 100644 --- a/examples/sensors/maze/content/start.png +++ b/examples/sensors/maze/content/start.png diff --git a/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png b/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png Binary files differindex 149529e..e0ba0e7 100644 --- a/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png +++ b/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png diff --git a/examples/sensors/sensor_explorer/doc/images/qtsensors-examples-explorer.png b/examples/sensors/sensor_explorer/doc/images/qtsensors-examples-explorer.png Binary files differindex 0976b9f..888fc3c 100644 --- a/examples/sensors/sensor_explorer/doc/images/qtsensors-examples-explorer.png +++ b/examples/sensors/sensor_explorer/doc/images/qtsensors-examples-explorer.png |
