diff options
author | Wolfgang Beck <wolfgang.beck@nokia.com> | 2012-05-17 12:27:18 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-24 03:06:56 +0200 |
commit | 17d908ba5205513e9ed0be33aebeb3736bda0326 (patch) | |
tree | da04213540ee61853aab6b4260721f1badd703b2 | |
parent | 32e2d98ea438041e7e0c4df7e67053c5ee7527a7 (diff) | |
download | qtsensors-17d908ba5205513e9ed0be33aebeb3736bda0326.tar.gz |
Unfork the examples.
Some examples were forked off and updated. Unfork by bringing
these changes back (a later update will bring the other examples
in line with this new style).
The changes are primarily made up of file renaming.
Also, JPG files have been converted to PNG.
Some documentation updates have been done.
Change-Id: Ib090abb5ebea2003d479d2336a23317f52b8c4d8
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
-rw-r--r-- | doc/src/cubehouse.qdoc | 12 | ||||
-rw-r--r-- | doc/src/examples/accelbubble.qdoc | 10 | ||||
-rw-r--r-- | doc/src/examples/grue.qdoc | 14 | ||||
-rw-r--r-- | doc/src/examples/maze.qdoc | 19 | ||||
-rw-r--r-- | doc/src/examples/qmlqtsensors.qdoc | 26 | ||||
-rw-r--r-- | doc/src/examples/sensor_explorer.qdoc | 57 | ||||
-rw-r--r-- | doc/src/examples/sensorgestures.qdoc | 6 | ||||
-rw-r--r-- | doc/src/examples/shakeit.qdoc | 41 | ||||
-rw-r--r-- | doc/src/images/maze.jpg | bin | 38102 -> 0 bytes | |||
-rw-r--r-- | doc/src/images/maze.png | bin | 0 -> 215132 bytes | |||
-rw-r--r-- | doc/src/images/qmlqtsensors.jpg | bin | 26008 -> 0 bytes | |||
-rw-r--r-- | doc/src/images/qmlqtsensors.png | bin | 0 -> 82345 bytes | |||
-rw-r--r-- | doc/src/images/sensorexplorer.jpg | bin | 30397 -> 0 bytes | |||
-rw-r--r-- | doc/src/images/sensorexplorer.png | bin | 0 -> 83503 bytes | |||
-rw-r--r-- | doc/src/images/shakeit.jpg | bin | 8889 -> 0 bytes | |||
-rw-r--r-- | doc/src/images/shakeit.png | bin | 0 -> 29380 bytes | |||
-rw-r--r-- | doc/src/imports/qtsensors5.qdoc | 2 | ||||
-rw-r--r-- | doc/src/qmlsensorgtestures.qdoc | 14 | ||||
-rw-r--r-- | doc/src/qtsensors-cpp.qdoc | 2 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors.pro (renamed from examples/sensors/sensors.pro) | 8 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/Congratulation.qml (renamed from examples/sensors/maze/Congratulation.qml) | 2 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/LabyrinthSquare.qml (renamed from examples/sensors/maze/LabyrinthSquare.qml) | 10 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/Mouse.qml (renamed from examples/sensors/maze/Mouse.qml) | 16 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/QtSensors_maze.pro | 4 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/QtSensors_maze.qml (renamed from examples/sensors/maze/Maze.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/components/ApplicationWindow.qml (renamed from examples/sensors/maze/components/ApplicationWindow.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/components/Button.qml (renamed from examples/sensors/maze/components/Button.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/components/images/button_background_disabled.png (renamed from examples/sensors/maze/components/images/button_background_disabled.png) | bin | 579 -> 579 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/components/images/button_background_normal.png (renamed from examples/sensors/maze/components/images/button_background_normal.png) | bin | 901 -> 901 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/components/images/button_background_pressed.png (renamed from examples/sensors/maze/components/images/button_background_pressed.png) | bin | 334 -> 334 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/content/00.png (renamed from examples/sensors/maze/images/00.png) | bin | 186 -> 186 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/content/01.png (renamed from examples/sensors/maze/images/01.png) | bin | 708 -> 708 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/content/cheese.png (renamed from examples/sensors/maze/images/cheese.png) | bin | 317 -> 317 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/content/cheeseeating.gif (renamed from examples/sensors/maze/images/cheeseeating.gif) | bin | 650 -> 650 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/content/congratulations.gif (renamed from examples/sensors/maze/images/congratulations.gif) | bin | 10811 -> 10811 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/content/mouse_down.gif (renamed from examples/sensors/maze/images/mouse_down.gif) | bin | 974 -> 974 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/content/mouse_left.gif (renamed from examples/sensors/maze/images/mouse_left.gif) | bin | 970 -> 970 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/content/mouse_leftdown.gif (renamed from examples/sensors/maze/images/mouse_leftdown.gif) | bin | 976 -> 976 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/content/mouse_leftup.gif (renamed from examples/sensors/maze/images/mouse_leftup.gif) | bin | 976 -> 976 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/content/mouse_right.gif (renamed from examples/sensors/maze/images/mouse_right.gif) | bin | 971 -> 971 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/content/mouse_rightdown.gif (renamed from examples/sensors/maze/images/mouse_rightdown.gif) | bin | 977 -> 977 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/content/mouse_rightup.gif (renamed from examples/sensors/maze/images/mouse_rightup.gif) | bin | 975 -> 975 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/content/mouse_up.gif (renamed from examples/sensors/maze/images/mouse_up.gif) | bin | 970 -> 970 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/content/start.png (renamed from examples/sensors/maze/images/start.png) | bin | 677 -> 677 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/icon.png (renamed from examples/sensors/maze/icon.png) | bin | 4693 -> 4693 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/info.json | 15 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/lib.js (renamed from examples/sensors/maze/lib.js) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_maze/qml.pro (renamed from examples/sensors/maze/maze.pro) | 10 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.pro | 4 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml (renamed from examples/sensors/qmlqtsensors/main.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlqtsensors/components/ApplicationWindow.qml (renamed from examples/sensors/qmlqtsensors/components/ApplicationWindow.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlqtsensors/components/Button.qml (renamed from examples/sensors/qmlqtsensors/components/Button.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_disabled.png (renamed from examples/sensors/qmlqtsensors/components/images/button_background_disabled.png) | bin | 579 -> 579 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_normal.png (renamed from examples/sensors/qmlqtsensors/components/images/button_background_normal.png) | bin | 901 -> 901 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_pressed.png (renamed from examples/sensors/qmlqtsensors/components/images/button_background_pressed.png) | bin | 334 -> 334 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlqtsensors/icon.png (renamed from examples/sensors/qmlqtsensors/icon.png) | bin | 2122 -> 2122 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlqtsensors/info.json | 15 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlqtsensors/qml.pro (renamed from examples/sensors/qmlqtsensors/qmlqtsensors.pro) | 2 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/PropertyList.qml (renamed from examples/sensors/sensor_explorer/qml_app/PropertyList.qml) | 2 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.pro (renamed from examples/sensors/sensor_explorer/sensor_explorer.pro) | 3 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml (renamed from examples/sensors/sensor_explorer/qml_app/main.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/SensorList.qml (renamed from examples/sensors/sensor_explorer/qml_app/SensorList.qml) | 2 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/components/ApplicationWindow.qml (renamed from examples/sensors/sensor_explorer/qml_app/components/ApplicationWindow.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/components/Button.qml (renamed from examples/sensors/sensor_explorer/qml_app/components/Button.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/components/TextField.qml (renamed from examples/sensors/sensor_explorer/qml_app/components/TextField.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_disabled.png (renamed from examples/sensors/sensor_explorer/qml_app/components/images/button_background_disabled.png) | bin | 579 -> 579 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_normal.png (renamed from examples/sensors/sensor_explorer/qml_app/components/images/button_background_normal.png) | bin | 901 -> 901 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_pressed.png (renamed from examples/sensors/sensor_explorer/qml_app/components/images/button_background_pressed.png) | bin | 334 -> 334 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/components/images/textfield_background_disabled.png (renamed from examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_disabled.png) | bin | 936 -> 936 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/components/images/textfield_background_normal.png (renamed from examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_normal.png) | bin | 767 -> 767 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/content/listitem_select.png (renamed from examples/sensors/sensor_explorer/qml_app/images/listitem_select.png) | bin | 156 -> 156 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/icon.png (renamed from examples/sensors/sensor_explorer/qml_app/icon.png) | bin | 2205 -> 2205 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/import/explorer.cpp (renamed from examples/sensors/sensor_explorer/import/explorer.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/import/explorer.h (renamed from examples/sensors/sensor_explorer/import/explorer.h) | 2 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/import/import.pro (renamed from examples/sensors/sensor_explorer/import/import.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/import/main.cpp (renamed from examples/sensors/sensor_explorer/import/main.cpp) | 4 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/import/plugin.json (renamed from examples/sensors/grue/import/plugin.json) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.cpp (renamed from examples/sensors/sensor_explorer/import/propertyinfo.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.h (renamed from examples/sensors/sensor_explorer/import/propertyinfo.h) | 2 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/import/qmldir (renamed from examples/sensors/sensor_explorer/import/qmldir) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.cpp (renamed from examples/sensors/sensor_explorer/import/sensoritem.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.h (renamed from examples/sensors/sensor_explorer/import/sensoritem.h) | 2 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/info.json | 15 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensor_explorer/qml.pro (renamed from examples/sensors/sensor_explorer/qml_app/qml_app.pro) | 8 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.pro | 3 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml (renamed from examples/sensors/shakeit/shakeit.qml) | 8 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_shakeit/audio/loopy2a_mono.wav (renamed from examples/sensors/shakeit/audio/loopy2a_mono.wav) | bin | 67772 -> 67772 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_shakeit/audio/phone.wav (renamed from examples/sensors/shakeit/audio/phone.wav) | bin | 22094 -> 22094 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_shakeit/content/triangle.png (renamed from examples/sensors/shakeit/images/triangle.png) | bin | 7251 -> 7251 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_shakeit/content/triangle2.png (renamed from examples/sensors/shakeit/images/triangle2.png) | bin | 5633 -> 5633 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_shakeit/content/triangle3.png (renamed from examples/sensors/shakeit/images/triangle3.png) | bin | 5101 -> 5101 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_shakeit/icon.png (renamed from examples/sensors/shakeit/icon.png) | bin | 10695 -> 10695 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_shakeit/info.json | 14 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_shakeit/qml.pro (renamed from examples/sensors/shakeit/shakeit.pro) | 4 | ||||
-rw-r--r-- | examples/QtSensors/accel/accel.pro (renamed from examples/sensors/accel/accel.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/accel/main.cpp (renamed from examples/sensors/accel/main.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/accelbubble/accelbubble.pro (renamed from examples/sensors/accelbubble/accelbubble.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/accelbubble/icon.png (renamed from examples/sensors/accelbubble/icon.png) | bin | 2034 -> 2034 bytes | |||
-rw-r--r-- | examples/QtSensors/accelbubble/images/Bluebubble2.png (renamed from examples/sensors/accelbubble/images/Bluebubble2.png) | bin | 12815 -> 12815 bytes | |||
-rw-r--r-- | examples/QtSensors/accelbubble/info.json (renamed from examples/sensors/accelbubble/info.json) | 0 | ||||
-rw-r--r-- | examples/QtSensors/accelbubble/main.qml (renamed from examples/sensors/accelbubble/main.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/cubehouse/Cube.qml (renamed from examples/sensors/cubehouse/Cube.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/cubehouse/Cubehouse.qml (renamed from examples/sensors/cubehouse/Cubehouse.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/cubehouse/Room.qml (renamed from examples/sensors/cubehouse/Room.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/cubehouse/Table.qml (renamed from examples/sensors/cubehouse/Table.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/cubehouse/cubehouse.pro (renamed from examples/sensors/cubehouse/cubehouse.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/cubehouse/icon.png (renamed from examples/sensors/cubehouse/icon.png) | bin | 7607 -> 7607 bytes | |||
-rw-r--r-- | examples/QtSensors/cubehouse/images/ground.jpg (renamed from examples/sensors/cubehouse/images/ground.jpg) | bin | 3077 -> 3077 bytes | |||
-rw-r--r-- | examples/QtSensors/cubehouse/images/qtlogo.png (renamed from examples/sensors/cubehouse/images/qtlogo.png) | bin | 13923 -> 13923 bytes | |||
-rw-r--r-- | examples/QtSensors/cubehouse/images/roof.jpg (renamed from examples/sensors/cubehouse/images/roof.jpg) | bin | 3866 -> 3866 bytes | |||
-rw-r--r-- | examples/QtSensors/cubehouse/images/wall.jpg (renamed from examples/sensors/cubehouse/images/wall.jpg) | bin | 6195 -> 6195 bytes | |||
-rw-r--r-- | examples/QtSensors/cubehouse/info.json (renamed from examples/sensors/cubehouse/info.json) | 0 | ||||
-rw-r--r-- | examples/QtSensors/cubehouse/mesh/table.3ds (renamed from examples/sensors/cubehouse/mesh/table.3ds) | bin | 9149 -> 9149 bytes | |||
-rw-r--r-- | examples/QtSensors/grue/console_app/console_app.pro (renamed from examples/sensors/grue/console_app/console_app.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/console_app/main.cpp (renamed from examples/sensors/grue/console_app/main.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/grue.pro (renamed from examples/sensors/grue/grue.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/import/import.pro (renamed from examples/sensors/grue/import/import.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/import/main.cpp (renamed from examples/sensors/grue/import/main.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/import/plugin.json (renamed from examples/sensors/sensor_explorer/import/plugin.json) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/import/qmldir (renamed from examples/sensors/grue/import/qmldir) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/lib/gruesensor.cpp (renamed from examples/sensors/grue/lib/gruesensor.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/lib/gruesensor.h (renamed from examples/sensors/grue/lib/gruesensor.h) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/lib/gruesensor_p.h (renamed from examples/sensors/grue/lib/gruesensor_p.h) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/lib/lib.pro (renamed from examples/sensors/grue/lib/lib.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/plugin/gruesensorimpl.cpp (renamed from examples/sensors/grue/plugin/gruesensorimpl.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/plugin/gruesensorimpl.h (renamed from examples/sensors/grue/plugin/gruesensorimpl.h) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/plugin/main.cpp (renamed from examples/sensors/grue/plugin/main.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/plugin/plugin.json (renamed from examples/sensors/grue/plugin/plugin.json) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/plugin/plugin.pro (renamed from examples/sensors/grue/plugin/plugin.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/qml_app/grue.png (renamed from examples/sensors/grue/qml_app/grue.png) | bin | 11207 -> 11207 bytes | |||
-rw-r--r-- | examples/QtSensors/grue/qml_app/grue.xcf (renamed from examples/sensors/grue/qml_app/grue.xcf) | bin | 23704 -> 23704 bytes | |||
-rw-r--r-- | examples/QtSensors/grue/qml_app/icon.png (renamed from examples/sensors/grue/qml_app/icon.png) | bin | 7951 -> 7951 bytes | |||
-rw-r--r-- | examples/QtSensors/grue/qml_app/icon.xcf (renamed from examples/sensors/grue/qml_app/icon.xcf) | bin | 22397 -> 22397 bytes | |||
-rw-r--r-- | examples/QtSensors/grue/qml_app/info.json (renamed from examples/sensors/grue/qml_app/info.json) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/qml_app/main.qml (renamed from examples/sensors/grue/qml_app/main.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/grue/qml_app/qml_app.pro (renamed from examples/sensors/grue/qml_app/qml_app.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/qmlsensorgestures/plugin/plugin.json (renamed from examples/sensors/qmlsensorgestures/plugin/plugin.json) | 0 | ||||
-rw-r--r-- | examples/QtSensors/qmlsensorgestures/plugin/plugin.pro (renamed from examples/sensors/qmlsensorgestures/plugin/plugin.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp (renamed from examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.h (renamed from examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h) | 0 | ||||
-rw-r--r-- | examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp (renamed from examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.h (renamed from examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.h) | 0 | ||||
-rw-r--r-- | examples/QtSensors/qmlsensorgestures/qml_app/Button.qml (renamed from examples/sensors/qmlsensorgestures/qml_app/Button.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/qmlsensorgestures/qml_app/Gesture.qml (renamed from examples/sensors/qmlsensorgestures/qml_app/Gesture.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/qmlsensorgestures/qml_app/GestureList.qml (renamed from examples/sensors/qmlsensorgestures/qml_app/GestureList.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml (renamed from examples/sensors/qmlsensorgestures/qml_app/GestureView.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/qmlsensorgestures/qml_app/GesturesView.qml (renamed from examples/sensors/qmlsensorgestures/qml_app/GesturesView.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/qmlsensorgestures/qml_app/icon.png (renamed from examples/sensors/qmlsensorgestures/qml_app/icon.png) | bin | 2298 -> 2298 bytes | |||
-rw-r--r-- | examples/QtSensors/qmlsensorgestures/qml_app/info.json (renamed from examples/sensors/qmlsensorgestures/qml_app/info.json) | 0 | ||||
-rw-r--r-- | examples/QtSensors/qmlsensorgestures/qml_app/qml_app.pro (renamed from examples/sensors/qmlsensorgestures/qml_app/qml_app.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/qmlsensorgestures/qmlsensorgestures.pro (renamed from examples/sensors/qmlsensorgestures/qmlsensorgestures.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/sensorgestures/gesture.png (renamed from examples/sensors/sensorgestures/gesture.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/QtSensors/sensorgestures/main.cpp (renamed from examples/sensors/sensorgestures/main.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/sensorgestures/mainwindow.cpp (renamed from examples/sensors/sensorgestures/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/sensorgestures/mainwindow.h (renamed from examples/sensors/sensorgestures/mainwindow.h) | 0 | ||||
-rw-r--r-- | examples/QtSensors/sensorgestures/mainwindow.ui (renamed from examples/sensors/sensorgestures/mainwindow.ui) | 0 | ||||
-rw-r--r-- | examples/QtSensors/sensorgestures/sensorgestures.pro (renamed from examples/sensors/sensorgestures/sensorgestures.pro) | 0 | ||||
-rw-r--r-- | examples/examples.pro | 2 | ||||
-rw-r--r-- | examples/sensors/maze/info.json | 14 | ||||
-rw-r--r-- | examples/sensors/qmlqtsensors/info.json | 14 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/qml_app/info.json | 15 | ||||
-rw-r--r-- | examples/sensors/shakeit/info.json | 13 | ||||
-rw-r--r-- | src/imports/sensors2/qsensor2ambientlight.cpp | 2 | ||||
-rw-r--r-- | src/imports/sensors2/qsensor2proximity.cpp | 2 | ||||
-rw-r--r-- | src/imports/sensors2/qsensor2tilt.cpp | 2 |
165 files changed, 223 insertions, 199 deletions
diff --git a/doc/src/cubehouse.qdoc b/doc/src/cubehouse.qdoc index 7555bb8..42bdd3d 100644 --- a/doc/src/cubehouse.qdoc +++ b/doc/src/cubehouse.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example sensors/cubehouse + \example QtSensors/cubehouse \title Cube House QML Accelerometer example \ingroup qtsensors-examples \brief The Cube House example demonstrates the use of the accelerometer to drive a camera to create a pseudo-3D effect. @@ -37,24 +37,24 @@ Import the QtMobility.sensors declarative plugin: -\snippet ../examples/sensors/cubehouse/Cubehouse.qml 0 +\snippet ../examples/QtSensors/cubehouse/Cubehouse.qml 0 Add the Accelerometer QML elements into your qml file. -\snippet ../examples/sensors/cubehouse/Cubehouse.qml 1 +\snippet ../examples/QtSensors/cubehouse/Cubehouse.qml 1 In additional two properties are added to save the calculated pitch and roll values: -\snippet ../examples/sensors/cubehouse/Cubehouse.qml 2 +\snippet ../examples/QtSensors/cubehouse/Cubehouse.qml 2 Reading out the Accelerometer data can be done by implementing the 'onReadingChanged' slot and accessing the 'reading' property from the Accelerometer element: -\snippet ../examples/sensors/cubehouse/Cubehouse.qml 3 +\snippet ../examples/QtSensors/cubehouse/Cubehouse.qml 3 By using a timer the view can be rotated using the pitch and roll properties from the Accelerometer element: -\snippet ../examples/sensors/cubehouse/Cubehouse.qml 4 +\snippet ../examples/QtSensors/cubehouse/Cubehouse.qml 4 */ diff --git a/doc/src/examples/accelbubble.qdoc b/doc/src/examples/accelbubble.qdoc index 2d4bd88..962bce6 100644 --- a/doc/src/examples/accelbubble.qdoc +++ b/doc/src/examples/accelbubble.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example sensors/accelbubble + \example QtSensors/accelbubble \title Accel Bubble \brief The AccelBubble example demonstrates the Legacy Accelerometer QML element. \ingroup qtsensors-examples @@ -36,19 +36,19 @@ Import the Legacy Sensors Declarative module. -\snippet ../examples/sensors/accelbubble/main.qml 0 +\snippet ../examples/QtSensors/accelbubble/main.qml 0 Add an Accelerometer QML element. -\snippet ../examples/sensors/accelbubble/main.qml 1 +\snippet ../examples/QtSensors/accelbubble/main.qml 1 The accelerometer might run too fast for what we need, so add a timer to read the accelerometer's readings. -\snippet ../examples/sensors/accelbubble/main.qml 2 +\snippet ../examples/QtSensors/accelbubble/main.qml 2 Use the 'active' property to start the sensor -\snippet ../examples/sensors/accelbubble/main.qml 3 +\snippet ../examples/QtSensors/accelbubble/main.qml 3 */ diff --git a/doc/src/examples/grue.qdoc b/doc/src/examples/grue.qdoc index 74283b0..a64528a 100644 --- a/doc/src/examples/grue.qdoc +++ b/doc/src/examples/grue.qdoc @@ -57,7 +57,7 @@ */ /*! - \example sensors/grue/lib + \example QtSensors/grue/lib \title Grue Sensor Definition \brief The Grue sensor is defined in a library so that applications can use it. @@ -78,7 +78,7 @@ */ /*! - \example sensors/grue/plugin + \example QtSensors/grue/plugin \title Grue Sensor Implementation \brief The Grue sensor implementation lives in a plugin that is loaded by the Qt Sensors library. @@ -94,13 +94,13 @@ light sensor. In the start method, the backend should be sure to call the sensorStopped() or sensorBusy() methods if it cannot start. - \snippet ../examples/sensors/grue/plugin/gruesensorimpl.cpp start + \snippet ../examples/QtSensors/grue/plugin/gruesensorimpl.cpp start The setReading method is needed so that the sensors library knows where the readings are coming from. This backend has a local copy of the reading so it passes a pointer to the function. - \snippet ../examples/sensors/grue/plugin/gruesensorimpl.cpp setReading + \snippet ../examples/QtSensors/grue/plugin/gruesensorimpl.cpp setReading However it is also possible to pass null to the setReading method in which case the sensors library will create an instance and return a pointer. @@ -123,7 +123,7 @@ */ /*! - \example sensors/grue/console_app + \example QtSensors/grue/console_app \title Grue Sensor Console Application \brief The Grue sensor console application demonstrates use of the Grue sensor. @@ -135,7 +135,7 @@ */ /*! - \example sensors/grue/import + \example QtSensors/grue/import \title Grue Sensor QML Import \brief The Grue sensor QML import exports the GrueSensor class as a QML element. @@ -145,7 +145,7 @@ */ /*! - \example sensors/grue/qml_app + \example QtSensors/grue/qml_app \title Grue Sensor QML Application \brief The Grue sensor QML application demonstrates use of the GrueSensor QML element. diff --git a/doc/src/examples/maze.qdoc b/doc/src/examples/maze.qdoc index 3b89271..ed2aeab 100644 --- a/doc/src/examples/maze.qdoc +++ b/doc/src/examples/maze.qdoc @@ -26,32 +26,33 @@ ****************************************************************************/ /*! - \example sensors/maze - \title Maze example + \example QtSensors/QtSensors_maze + \title Qt Sensors - Maze QML Example \ingroup qtsensors-examples + \image maze.png + + \section2 Maze in QML \brief The Maze example demonstrates the TiltSensor QML element. - \image maze.jpg -\section1 Overview + To write a QML application that will use the TiltSensor QML sensors element you need to do the following steps: Import the QtSensors 5.x declarative plugin: -\snippet ../examples/sensors/maze/Maze.qml 0 + \snippet ../examples/QtSensors/QtSensors_maze/QtSensors_maze.qml 0 Add the Sensor QML elements into your qml file. In this example we use the TiltSensor with values based in degrees and an accuracy of 5 degree: -\snippet ../examples/sensors/maze/Maze.qml 1 + \snippet ../examples/QtSensors/QtSensors_maze/QtSensors_maze.qml 1 Starting the sensor can be done by setting the 'enabled' property to true: -\snippet ../examples/sensors/maze/Maze.qml 2 + \snippet ../examples/QtSensors/QtSensors_maze/QtSensors_maze.qml 2 To determine the walk direction of the mouse we use the following if -else statements: -\snippet ../examples/sensors/maze/Maze.qml 3 - + \snippet ../examples/QtSensors/QtSensors_maze/QtSensors_maze.qml 3 */ diff --git a/doc/src/examples/qmlqtsensors.qdoc b/doc/src/examples/qmlqtsensors.qdoc index d817330..4c50939 100644 --- a/doc/src/examples/qmlqtsensors.qdoc +++ b/doc/src/examples/qmlqtsensors.qdoc @@ -26,43 +26,45 @@ ****************************************************************************/ /*! - \example sensors/qmlqtsensors - \title Qt Sensors - Simple QML Example + \example QtSensors/QtSensors_qmlqtsensors + \title Qt Sensors - QML example \ingroup qtsensors-examples - \brief The Qt Sensors simple QML example demonstrates the QML sensors elements in the QtSensors 5 import. - \image qmlqtsensors.jpg + \image qmlqtsensors.png + + \section2 Qt Sensors in QML + \brief The QML QtSensors example demonstrates the QML sensors elements in the QtSensors 5 import. + -\section1 Overview To write a QML application that will use the QML sensors elements in the QtSensors 5 import you need to to the following steps: Import the QtSensors 5.x declarative plugin: -\snippet ../examples/sensors/qmlqtsensors/main.qml 0 + \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 0 Add the Sensor QML elements into your qml file. In this example we use the TiltSensor: -\snippet ../examples/sensors/qmlqtsensors/main.qml 1 + \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 1 The Tilt-, AmbientLight- and the Proximity QML element sensor have the 'enabled' property in common. To start or stop the sensor set this property to true or false. -\snippet ../examples/sensors/qmlqtsensors/main.qml 2 + \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 2 Reading the data can be done for each sensor type like following: \l {QtSensors5::TiltSensor} {TiltSensor} -\snippet ../examples/sensors/qmlqtsensors/main.qml 3 -\snippet ../examples/sensors/qmlqtsensors/main.qml 4 + \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 3 + \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 4 \l {QtSensors5::AmbientLightSensor} {AmbientLightSensor} -\snippet ../examples/sensors/qmlqtsensors/main.qml 5 + \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 5 \l {QtSensors5::ProximitySensor} {ProximitySensor} -\snippet ../examples/sensors/qmlqtsensors/main.qml 6 + \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 6 */ diff --git a/doc/src/examples/sensor_explorer.qdoc b/doc/src/examples/sensor_explorer.qdoc index d8c6a5f..1f8e022 100644 --- a/doc/src/examples/sensor_explorer.qdoc +++ b/doc/src/examples/sensor_explorer.qdoc @@ -26,60 +26,67 @@ ****************************************************************************/ /*! - \example sensors/sensor_explorer - \title Sensor Explorer example + \example QtSensors/QtSensors_sensor_explorer + \title Qt Sensors - Explorer QML example \ingroup qtsensors-examples - \brief The Sensor Explorer example demonstrates how to read the meta-data of available sensors. - \image sensorexplorer.jpg - -\section1 Overview - This example contains 2 projects. - - A \l{Sensor Explorer QML Import} to make the sensors and their meta-data available to a QML application. - - A \l{Sensor Explorer QML Application} that represents the \l{Sensor Explorer QML Import} information to the user interface. + \image sensorexplorer.png - \section1 Sensor Explorer QML Import + \section2 Sensor Explorer in QML + \brief The Sensor Explorer example demonstrates how to read the meta-data of available sensors. - The Sensor Explorer QML import exports the QSensorExplorer, QPropertyInfo and the QSensorItem class as a QML element. - This example creates the \e {Explorer 1.0} import. + This example is divided into two parts: - It consists of the code under the \c{import/} directory. + \list + \li A \l{Sensor Explorer QML Import}{C++ plug-in} that provides QML alternatives for QSensorExplorer, QPropertyInfo and the QSensorItem classes. + \li A QML Application that uses the QML alternatives to read the sensors meta-data and present it. + \endlist - \section1 Sensor Explorer QML Application This is a pure QML application that can be run from Qt Creator or directly using the - \c qmlscene binary. This app won't work if it cannot locate its related import. + \c qmlscene binary. You should install the other C++ plug-in before trying to run + this example, otherwise it will not find its dependencies. \code qmlscene main.qml \endcode -\section2 Overview To write a QML application that will use the Explorer QML element you need to do the following steps: Import the Explorer 1.0 declarative plugin: - \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 0 + \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 0 Create a SensorExplorer QML item: - \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 1 + \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 1 You can retrieve a list of all available sensors using the SensorExplorer: - \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 2 + \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 2 To retrieve the properties of a SensorItem use: - \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 3 + \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 3 Changing a property value can be done like: - \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 4 + \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 4 + + Starting and stopping a sensor can be done like: - Starting and stoping a sesnor can be done like: + \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 5 +*/ + +/*! + \example QtSensors/QtSensors_sensor_explorer/import + \title Sensor Explorer QML Import + + \section2 Sensor Explorer Declarative Plugin + \brief The Sensor Explorer QML import exports the QSensorExplorer, QPropertyInfo and the QSensorItem class as a QML element. - \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 5 + This example creates the \e {Explorer 1.0} import. + + \sa {Qt Sensors - Explorer QML example} */ + diff --git a/doc/src/examples/sensorgestures.qdoc b/doc/src/examples/sensorgestures.qdoc index 2fb1fe2..6da13c8 100644 --- a/doc/src/examples/sensorgestures.qdoc +++ b/doc/src/examples/sensorgestures.qdoc @@ -45,17 +45,17 @@ In order to know about custom signals that may be available, we need to ask the QSensorGestureManager about them, Using the QSensorGesture::gestureIds() function, the manager will return a QStringList of known and valid gesture Ids. - \snippet ../examples/sensors/sensorgestures/mainwindow.cpp 0 + \snippet ../examples/QtSensors/sensorgestures/mainwindow.cpp 0 We can then use this to create a QSensorGesture object that we can use to connect signals to, and start the detection process. A QSensorGesture object will take a list of one or more recognizer ids in it's constructor. - \snippet ../examples/sensors/sensorgestures/mainwindow.cpp 1 + \snippet ../examples/QtSensors/sensorgestures/mainwindow.cpp 1 and later stop the detection process. - \snippet ../examples/sensors/sensorgestures/mainwindow.cpp 2 + \snippet ../examples/QtSensors/sensorgestures/mainwindow.cpp 2 The QSensorGesture object will contain all the signals of the valid requested recognizers found on the system. diff --git a/doc/src/examples/shakeit.qdoc b/doc/src/examples/shakeit.qdoc index 409077d..fca2a9d 100644 --- a/doc/src/examples/shakeit.qdoc +++ b/doc/src/examples/shakeit.qdoc @@ -26,40 +26,39 @@ ****************************************************************************/ /*! - \example sensors/shakeit - \title ShakeIt! QML Sensor Gestures Example + \example QtSensors/QtSensors_shakeit + \title Qt Sensors - ShakeIt QML Example \ingroup qtsensors-examples + \image shakeit.png + + \section2 ShakeIt in QML \brief The sensor gesture example demonstrates the steps for creating a QML application that uses sensor gestures and the included shake sensor. - \image shakeit.jpg - - \section1 Overview - Writing a QML application that uses the Shake QML sensorgestures element - requires the following steps: - Import the Sensors Declarative module. + Writing a QML application that uses the Shake QML sensorgestures element requires the following steps: - \snippet ../examples/sensors/shakeit/shakeit.qml 0 + Import the Sensors Declarative module. - Add a SensorGesture QML element. + \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 0 - \snippet ../examples/sensors/shakeit/shakeit.qml 1 + Add a SensorGesture QML element. - In the SensorGesture element, specify which gesture to be used. - Note that this can be a comma separated list. Here we are only interested in one - gesture recognizer. + \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 1 - \snippet ../examples/sensors/shakeit/shakeit.qml 2 + In the SensorGesture element, specify which gesture to be used. + Note that this can be a comma separated list. Here we are only interested in one + gesture recognizer. - Use the 'enabled' property to start the sensor gesture. + \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 2 - \snippet ../examples/sensors/shakeit/shakeit.qml 3 + Use the 'enabled' property to start the sensor gesture. - Use the onDetected signal to do stuff. + \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 3 - \snippet ../examples/sensors/shakeit/shakeit.qml 4 + Use the onDetected signal to do stuff. - There are additional gestures to shake which are supported: - whip, twistRight, hover, cover, turnover and pickup. + \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 4 + There are additional gestures to shake which are supported: + whip, twistRight, hover, cover, turnover and pickup. */ diff --git a/doc/src/images/maze.jpg b/doc/src/images/maze.jpg Binary files differdeleted file mode 100644 index 1d6b9cc..0000000 --- a/doc/src/images/maze.jpg +++ /dev/null diff --git a/doc/src/images/maze.png b/doc/src/images/maze.png Binary files differnew file mode 100644 index 0000000..f3ad8de --- /dev/null +++ b/doc/src/images/maze.png diff --git a/doc/src/images/qmlqtsensors.jpg b/doc/src/images/qmlqtsensors.jpg Binary files differdeleted file mode 100644 index 7154362..0000000 --- a/doc/src/images/qmlqtsensors.jpg +++ /dev/null diff --git a/doc/src/images/qmlqtsensors.png b/doc/src/images/qmlqtsensors.png Binary files differnew file mode 100644 index 0000000..0a54b65 --- /dev/null +++ b/doc/src/images/qmlqtsensors.png diff --git a/doc/src/images/sensorexplorer.jpg b/doc/src/images/sensorexplorer.jpg Binary files differdeleted file mode 100644 index 81515ca..0000000 --- a/doc/src/images/sensorexplorer.jpg +++ /dev/null diff --git a/doc/src/images/sensorexplorer.png b/doc/src/images/sensorexplorer.png Binary files differnew file mode 100644 index 0000000..e9cda7a --- /dev/null +++ b/doc/src/images/sensorexplorer.png diff --git a/doc/src/images/shakeit.jpg b/doc/src/images/shakeit.jpg Binary files differdeleted file mode 100644 index 8df4b44..0000000 --- a/doc/src/images/shakeit.jpg +++ /dev/null diff --git a/doc/src/images/shakeit.png b/doc/src/images/shakeit.png Binary files differnew file mode 100644 index 0000000..5ca1b58 --- /dev/null +++ b/doc/src/images/shakeit.png diff --git a/doc/src/imports/qtsensors5.qdoc b/doc/src/imports/qtsensors5.qdoc index fc172ae..c3e6a2a 100644 --- a/doc/src/imports/qtsensors5.qdoc +++ b/doc/src/imports/qtsensors5.qdoc @@ -55,7 +55,7 @@ The emulator supports simulating the Ambient Light, Orientation, Compass and Proximity sensors. - The \l {Qt Sensors - Simple QML Example} contains code for using the the \l TiltSensor, \l AmbientLightSensor + The \l {Qt Sensors - QML example} contains code for using the the \l TiltSensor, \l AmbientLightSensor and ProximitySensor elements. \section1 QML Elements diff --git a/doc/src/qmlsensorgtestures.qdoc b/doc/src/qmlsensorgtestures.qdoc index 317105a..a384d26 100644 --- a/doc/src/qmlsensorgtestures.qdoc +++ b/doc/src/qmlsensorgtestures.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example sensors/qmlsensorgestures/qml_app + \example QtSensors/qmlsensorgestures/qml_app \title SensorGesture QML Element example \ingroup qtsensors-examples @@ -37,27 +37,27 @@ Import the QtSensors 5.x declarative plugin: -\snippet ../examples/sensors/qmlsensorgestures/qml_app/GestureView.qml 0 +\snippet ../examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml 0 Add the SensorGesture QML element into your qml file. -\snippet ../examples/sensors/qmlsensorgestures/qml_app/GestureView.qml 1 +\snippet ../examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml 1 Each SensorGesture QML element contains a property called gestures. In this example an alias 'gestureid' for this property is used. -\snippet ../examples/sensors/qmlsensorgestures/qml_app/GestureView.qml 2 +\snippet ../examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml 2 By using this alias property you define which gestures should be used: -\snippet ../examples/sensors/qmlsensorgestures/qml_app/Gesture.qml 3 +\snippet ../examples/QtSensors/qmlsensorgestures/qml_app/Gesture.qml 3 A list of all available gestures can be created by calling the 'availableGestures' property: -\snippet ../examples/sensors/qmlsensorgestures/qml_app/GestureList.qml 4 +\snippet ../examples/QtSensors/qmlsensorgestures/qml_app/GestureList.qml 4 -\sa {ShakeIt! QML Sensor Gestures Example} +\sa {Qt Sensors - ShakeIt QML Example} \sa {Qt Sensor Gestures} */ diff --git a/doc/src/qtsensors-cpp.qdoc b/doc/src/qtsensors-cpp.qdoc index 3df97f9..6cdd6a4 100644 --- a/doc/src/qtsensors-cpp.qdoc +++ b/doc/src/qtsensors-cpp.qdoc @@ -101,7 +101,7 @@ This code does not require any compile-time links to \l QAccelerometer or \snippet snippets/sensors/start.cpp Starting a sensor -You can discover all of this information at runtime too. The sensor_explorer example +You can discover all of this information at runtime too. The QtSensors_sensor_explorer example shows you information about available sensors. \section1 Front end, back end diff --git a/examples/sensors/sensors.pro b/examples/QtSensors/QtSensors.pro index 807203f..3e64991 100644 --- a/examples/sensors/sensors.pro +++ b/examples/QtSensors/QtSensors.pro @@ -5,11 +5,11 @@ SUBDIRS += \ accelbubble \ cubehouse \ grue \ - maze \ - qmlqtsensors \ qmlsensorgestures \ - sensor_explorer \ - shakeit + QtSensors_maze \ + QtSensors_qmlqtsensors \ + QtSensors_sensor_explorer \ + QtSensors_shakeit !isEmpty(QT.widgets.name):SUBDIRS += \ sensorgestures diff --git a/examples/sensors/maze/Congratulation.qml b/examples/QtSensors/QtSensors_maze/Congratulation.qml index b08ef1a..a8d6c41 100644 --- a/examples/sensors/maze/Congratulation.qml +++ b/examples/QtSensors/QtSensors_maze/Congratulation.qml @@ -56,6 +56,6 @@ Item { id: img anchors.fill: parent visible: true - source: "images/congratulations.gif" + source: "content/congratulations.gif" } } diff --git a/examples/sensors/maze/LabyrinthSquare.qml b/examples/QtSensors/QtSensors_maze/LabyrinthSquare.qml index 27ca84d..e5aacfc 100644 --- a/examples/sensors/maze/LabyrinthSquare.qml +++ b/examples/QtSensors/QtSensors_maze/LabyrinthSquare.qml @@ -65,16 +65,16 @@ Rectangle { function updateImage() { if (sq.val == -1) - sq.picture.source = "images/start.png"; + sq.picture.source = "content/start.png"; else if (sq.val == 3) - sq.picture.source = "images/cheese.png"; + sq.picture.source = "content/cheese.png"; else if (sq.val == 4){ - sq.picture.source = "images/cheeseeating.gif"; + sq.picture.source = "content/cheeseeating.gif"; sq.picture.playing = true; } else if (sq.val == 1) - sq.picture.source = "images/01.png"; + sq.picture.source = "content/01.png"; else - sq.picture.source = "images/00.png"; + sq.picture.source = "content/00.png"; } } diff --git a/examples/sensors/maze/Mouse.qml b/examples/QtSensors/QtSensors_maze/Mouse.qml index 9786d96..55dac18 100644 --- a/examples/sensors/maze/Mouse.qml +++ b/examples/QtSensors/QtSensors_maze/Mouse.qml @@ -63,36 +63,36 @@ Item { states: [ State { name: "up" - PropertyChanges { target: img; source: "images/mouse_up.gif" } + PropertyChanges { target: img; source: "content/mouse_up.gif" } }, State { name: "down" - PropertyChanges { target: img; source: "images/mouse_down.gif" } + PropertyChanges { target: img; source: "content/mouse_down.gif" } }, State { name: "left" - PropertyChanges { target: img; source: "images/mouse_left.gif" } + PropertyChanges { target: img; source: "content/mouse_left.gif" } }, State { name: "right" - PropertyChanges { target: img; source: "images/mouse_right.gif" } + PropertyChanges { target: img; source: "content/mouse_right.gif" } }, State { name: "rightup" - PropertyChanges { target: img; source: "images/mouse_rightup.gif" } + PropertyChanges { target: img; source: "content/mouse_rightup.gif" } }, State { name: "rightdown" - PropertyChanges { target: img; source: "images/mouse_rightdown.gif" } + PropertyChanges { target: img; source: "content/mouse_rightdown.gif" } }, State { name: "leftup" - PropertyChanges { target: img; source: "images/mouse_leftup.gif" } + PropertyChanges { target: img; source: "content/mouse_leftup.gif" } }, State { name: "leftdown" - PropertyChanges { target: img; source: "images/mouse_leftdown.gif" } + PropertyChanges { target: img; source: "content/mouse_leftdown.gif" } } ] diff --git a/examples/QtSensors/QtSensors_maze/QtSensors_maze.pro b/examples/QtSensors/QtSensors_maze/QtSensors_maze.pro new file mode 100644 index 0000000..a15e39e --- /dev/null +++ b/examples/QtSensors/QtSensors_maze/QtSensors_maze.pro @@ -0,0 +1,4 @@ +TEMPLATE = subdirs + +SUBDIRS = qml.pro + diff --git a/examples/sensors/maze/Maze.qml b/examples/QtSensors/QtSensors_maze/QtSensors_maze.qml index f52c00f..f52c00f 100644 --- a/examples/sensors/maze/Maze.qml +++ b/examples/QtSensors/QtSensors_maze/QtSensors_maze.qml diff --git a/examples/sensors/maze/components/ApplicationWindow.qml b/examples/QtSensors/QtSensors_maze/components/ApplicationWindow.qml index cab5e94..cab5e94 100644 --- a/examples/sensors/maze/components/ApplicationWindow.qml +++ b/examples/QtSensors/QtSensors_maze/components/ApplicationWindow.qml diff --git a/examples/sensors/maze/components/Button.qml b/examples/QtSensors/QtSensors_maze/components/Button.qml index 537a8bc..537a8bc 100644 --- a/examples/sensors/maze/components/Button.qml +++ b/examples/QtSensors/QtSensors_maze/components/Button.qml diff --git a/examples/sensors/maze/components/images/button_background_disabled.png b/examples/QtSensors/QtSensors_maze/components/images/button_background_disabled.png Binary files differindex 62a00b9..62a00b9 100644 --- a/examples/sensors/maze/components/images/button_background_disabled.png +++ b/examples/QtSensors/QtSensors_maze/components/images/button_background_disabled.png diff --git a/examples/sensors/maze/components/images/button_background_normal.png b/examples/QtSensors/QtSensors_maze/components/images/button_background_normal.png Binary files differindex 1fecad5..1fecad5 100644 --- a/examples/sensors/maze/components/images/button_background_normal.png +++ b/examples/QtSensors/QtSensors_maze/components/images/button_background_normal.png diff --git a/examples/sensors/maze/components/images/button_background_pressed.png b/examples/QtSensors/QtSensors_maze/components/images/button_background_pressed.png Binary files differindex 149529e..149529e 100644 --- a/examples/sensors/maze/components/images/button_background_pressed.png +++ b/examples/QtSensors/QtSensors_maze/components/images/button_background_pressed.png diff --git a/examples/sensors/maze/images/00.png b/examples/QtSensors/QtSensors_maze/content/00.png Binary files differindex ab29a62..ab29a62 100644 --- a/examples/sensors/maze/images/00.png +++ b/examples/QtSensors/QtSensors_maze/content/00.png diff --git a/examples/sensors/maze/images/01.png b/examples/QtSensors/QtSensors_maze/content/01.png Binary files differindex 0e70d1b..0e70d1b 100644 --- a/examples/sensors/maze/images/01.png +++ b/examples/QtSensors/QtSensors_maze/content/01.png diff --git a/examples/sensors/maze/images/cheese.png b/examples/QtSensors/QtSensors_maze/content/cheese.png Binary files differindex ecef450..ecef450 100644 --- a/examples/sensors/maze/images/cheese.png +++ b/examples/QtSensors/QtSensors_maze/content/cheese.png diff --git a/examples/sensors/maze/images/cheeseeating.gif b/examples/QtSensors/QtSensors_maze/content/cheeseeating.gif Binary files differindex 6b2cb47..6b2cb47 100644 --- a/examples/sensors/maze/images/cheeseeating.gif +++ b/examples/QtSensors/QtSensors_maze/content/cheeseeating.gif diff --git a/examples/sensors/maze/images/congratulations.gif b/examples/QtSensors/QtSensors_maze/content/congratulations.gif Binary files differindex 7020417..7020417 100644 --- a/examples/sensors/maze/images/congratulations.gif +++ b/examples/QtSensors/QtSensors_maze/content/congratulations.gif diff --git a/examples/sensors/maze/images/mouse_down.gif b/examples/QtSensors/QtSensors_maze/content/mouse_down.gif Binary files differindex 5491c18..5491c18 100644 --- a/examples/sensors/maze/images/mouse_down.gif +++ b/examples/QtSensors/QtSensors_maze/content/mouse_down.gif diff --git a/examples/sensors/maze/images/mouse_left.gif b/examples/QtSensors/QtSensors_maze/content/mouse_left.gif Binary files differindex 265d2ba..265d2ba 100644 --- a/examples/sensors/maze/images/mouse_left.gif +++ b/examples/QtSensors/QtSensors_maze/content/mouse_left.gif diff --git a/examples/sensors/maze/images/mouse_leftdown.gif b/examples/QtSensors/QtSensors_maze/content/mouse_leftdown.gif Binary files differindex bdcd708..bdcd708 100644 --- a/examples/sensors/maze/images/mouse_leftdown.gif +++ b/examples/QtSensors/QtSensors_maze/content/mouse_leftdown.gif diff --git a/examples/sensors/maze/images/mouse_leftup.gif b/examples/QtSensors/QtSensors_maze/content/mouse_leftup.gif Binary files differindex a8b1e8f..a8b1e8f 100644 --- a/examples/sensors/maze/images/mouse_leftup.gif +++ b/examples/QtSensors/QtSensors_maze/content/mouse_leftup.gif diff --git a/examples/sensors/maze/images/mouse_right.gif b/examples/QtSensors/QtSensors_maze/content/mouse_right.gif Binary files differindex a95d02c..a95d02c 100644 --- a/examples/sensors/maze/images/mouse_right.gif +++ b/examples/QtSensors/QtSensors_maze/content/mouse_right.gif diff --git a/examples/sensors/maze/images/mouse_rightdown.gif b/examples/QtSensors/QtSensors_maze/content/mouse_rightdown.gif Binary files differindex 00bc3e1..00bc3e1 100644 --- a/examples/sensors/maze/images/mouse_rightdown.gif +++ b/examples/QtSensors/QtSensors_maze/content/mouse_rightdown.gif diff --git a/examples/sensors/maze/images/mouse_rightup.gif b/examples/QtSensors/QtSensors_maze/content/mouse_rightup.gif Binary files differindex e0153eb..e0153eb 100644 --- a/examples/sensors/maze/images/mouse_rightup.gif +++ b/examples/QtSensors/QtSensors_maze/content/mouse_rightup.gif diff --git a/examples/sensors/maze/images/mouse_up.gif b/examples/QtSensors/QtSensors_maze/content/mouse_up.gif Binary files differindex 19220eb..19220eb 100644 --- a/examples/sensors/maze/images/mouse_up.gif +++ b/examples/QtSensors/QtSensors_maze/content/mouse_up.gif diff --git a/examples/sensors/maze/images/start.png b/examples/QtSensors/QtSensors_maze/content/start.png Binary files differindex 698c0b1..698c0b1 100644 --- a/examples/sensors/maze/images/start.png +++ b/examples/QtSensors/QtSensors_maze/content/start.png diff --git a/examples/sensors/maze/icon.png b/examples/QtSensors/QtSensors_maze/icon.png Binary files differindex 1e7ff8d..1e7ff8d 100644 --- a/examples/sensors/maze/icon.png +++ b/examples/QtSensors/QtSensors_maze/icon.png diff --git a/examples/QtSensors/QtSensors_maze/info.json b/examples/QtSensors/QtSensors_maze/info.json new file mode 100644 index 0000000..8e2ad1a --- /dev/null +++ b/examples/QtSensors/QtSensors_maze/info.json @@ -0,0 +1,15 @@ +{ + "info-version": "1.0", + "dict": { + "category": "application", + "runtime": "qml", + "displayName": { + "en_US": "Maze" + }, + "subcategory": "utility", + "main": "QtSensors_maze.qml", + "version": "1.0.0", + "identifier": "com.nokia.mt.maze", + "author": "Qt" + } +} diff --git a/examples/sensors/maze/lib.js b/examples/QtSensors/QtSensors_maze/lib.js index fccce18..fccce18 100644 --- a/examples/sensors/maze/lib.js +++ b/examples/QtSensors/QtSensors_maze/lib.js diff --git a/examples/sensors/maze/maze.pro b/examples/QtSensors/QtSensors_maze/qml.pro index cb3b9aa..765b9d0 100644 --- a/examples/sensors/maze/maze.pro +++ b/examples/QtSensors/QtSensors_maze/qml.pro @@ -1,15 +1,15 @@ TEMPLATE = aux app.files = \ - Congratulation.qml \ - Maze.qml \ components \ - images \ - lib.js \ + info.json \ + Congratulation.qml \ LabyrinthSquare.qml \ + lib.js \ + QtSensors_maze.qml \ Mouse.qml \ icon.png \ - info.json + content MT_SYSROOT=$$(MT_SYSROOT) !isEmpty(MT_SYSROOT):EXAMPLES_PREFIX=/opt/mt/applications diff --git a/examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.pro b/examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.pro new file mode 100644 index 0000000..a15e39e --- /dev/null +++ b/examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.pro @@ -0,0 +1,4 @@ +TEMPLATE = subdirs + +SUBDIRS = qml.pro + diff --git a/examples/sensors/qmlqtsensors/main.qml b/examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml index 44be63a..44be63a 100644 --- a/examples/sensors/qmlqtsensors/main.qml +++ b/examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml diff --git a/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml b/examples/QtSensors/QtSensors_qmlqtsensors/components/ApplicationWindow.qml index cab5e94..cab5e94 100644 --- a/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml +++ b/examples/QtSensors/QtSensors_qmlqtsensors/components/ApplicationWindow.qml diff --git a/examples/sensors/qmlqtsensors/components/Button.qml b/examples/QtSensors/QtSensors_qmlqtsensors/components/Button.qml index 537a8bc..537a8bc 100644 --- a/examples/sensors/qmlqtsensors/components/Button.qml +++ b/examples/QtSensors/QtSensors_qmlqtsensors/components/Button.qml diff --git a/examples/sensors/qmlqtsensors/components/images/button_background_disabled.png b/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_disabled.png Binary files differindex 62a00b9..62a00b9 100644 --- a/examples/sensors/qmlqtsensors/components/images/button_background_disabled.png +++ b/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_disabled.png diff --git a/examples/sensors/qmlqtsensors/components/images/button_background_normal.png b/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_normal.png Binary files differindex 1fecad5..1fecad5 100644 --- a/examples/sensors/qmlqtsensors/components/images/button_background_normal.png +++ b/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_normal.png diff --git a/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png b/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_pressed.png Binary files differindex 149529e..149529e 100644 --- a/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png +++ b/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_pressed.png diff --git a/examples/sensors/qmlqtsensors/icon.png b/examples/QtSensors/QtSensors_qmlqtsensors/icon.png Binary files differindex d3243c5..d3243c5 100644 --- a/examples/sensors/qmlqtsensors/icon.png +++ b/examples/QtSensors/QtSensors_qmlqtsensors/icon.png diff --git a/examples/QtSensors/QtSensors_qmlqtsensors/info.json b/examples/QtSensors/QtSensors_qmlqtsensors/info.json new file mode 100644 index 0000000..e548402 --- /dev/null +++ b/examples/QtSensors/QtSensors_qmlqtsensors/info.json @@ -0,0 +1,15 @@ +{ + "info-version": "1.0", + "dict": { + "category": "application", + "runtime": "qml", + "displayName": { + "en_US": "QML QtSensors" + }, + "subcategory": "utility", + "main": "QtSensors_qmlqtsensors.qml", + "version": "1.0.0", + "identifier": "com.nokia.mt.qmlqtsensors", + "author": "Qt" + } +} diff --git a/examples/sensors/qmlqtsensors/qmlqtsensors.pro b/examples/QtSensors/QtSensors_qmlqtsensors/qml.pro index 9ecebd9..e1ec872 100644 --- a/examples/sensors/qmlqtsensors/qmlqtsensors.pro +++ b/examples/QtSensors/QtSensors_qmlqtsensors/qml.pro @@ -2,7 +2,7 @@ TEMPLATE = aux app.files = \ info.json \ - main.qml \ + QtSensors_qmlqtsensors.qml \ icon.png \ components diff --git a/examples/sensors/sensor_explorer/qml_app/PropertyList.qml b/examples/QtSensors/QtSensors_sensor_explorer/PropertyList.qml index ba956fb..846c4cc 100644 --- a/examples/sensors/sensor_explorer/qml_app/PropertyList.qml +++ b/examples/QtSensors/QtSensors_sensor_explorer/PropertyList.qml @@ -93,7 +93,7 @@ Rectangle { Image { id: backgroundImage anchors.fill: parent - source: "images/listitem_select.png" + source: "content/listitem_select.png" visible: itemList.currentIndex === index } diff --git a/examples/sensors/sensor_explorer/sensor_explorer.pro b/examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.pro index 759e930..85ba45e 100644 --- a/examples/sensors/sensor_explorer/sensor_explorer.pro +++ b/examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.pro @@ -1,5 +1,6 @@ TEMPLATE = subdirs +CONFIG += ordered SUBDIRS = \ import \ - qml_app + qml.pro diff --git a/examples/sensors/sensor_explorer/qml_app/main.qml b/examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml index 8864160..8864160 100644 --- a/examples/sensors/sensor_explorer/qml_app/main.qml +++ b/examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml diff --git a/examples/sensors/sensor_explorer/qml_app/SensorList.qml b/examples/QtSensors/QtSensors_sensor_explorer/SensorList.qml index f95572b..da15737 100644 --- a/examples/sensors/sensor_explorer/qml_app/SensorList.qml +++ b/examples/QtSensors/QtSensors_sensor_explorer/SensorList.qml @@ -118,7 +118,7 @@ Rectangle { Image { id: backgroundImage anchors.fill: parent - source: "images/listitem_select.png" + source: "content/listitem_select.png" visible: itemList.currentIndex === index } diff --git a/examples/sensors/sensor_explorer/qml_app/components/ApplicationWindow.qml b/examples/QtSensors/QtSensors_sensor_explorer/components/ApplicationWindow.qml index cab5e94..cab5e94 100644 --- a/examples/sensors/sensor_explorer/qml_app/components/ApplicationWindow.qml +++ b/examples/QtSensors/QtSensors_sensor_explorer/components/ApplicationWindow.qml diff --git a/examples/sensors/sensor_explorer/qml_app/components/Button.qml b/examples/QtSensors/QtSensors_sensor_explorer/components/Button.qml index 537a8bc..537a8bc 100644 --- a/examples/sensors/sensor_explorer/qml_app/components/Button.qml +++ b/examples/QtSensors/QtSensors_sensor_explorer/components/Button.qml diff --git a/examples/sensors/sensor_explorer/qml_app/components/TextField.qml b/examples/QtSensors/QtSensors_sensor_explorer/components/TextField.qml index c1feaf2..c1feaf2 100644 --- a/examples/sensors/sensor_explorer/qml_app/components/TextField.qml +++ b/examples/QtSensors/QtSensors_sensor_explorer/components/TextField.qml diff --git a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_disabled.png b/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_disabled.png Binary files differindex 62a00b9..62a00b9 100644 --- a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_disabled.png +++ b/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_disabled.png diff --git a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_normal.png b/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_normal.png Binary files differindex 1fecad5..1fecad5 100644 --- a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_normal.png +++ b/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_normal.png diff --git a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_pressed.png b/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_pressed.png Binary files differindex 149529e..149529e 100644 --- a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_pressed.png +++ b/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_pressed.png diff --git a/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_disabled.png b/examples/QtSensors/QtSensors_sensor_explorer/components/images/textfield_background_disabled.png Binary files differindex 98bc601..98bc601 100644 --- a/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_disabled.png +++ b/examples/QtSensors/QtSensors_sensor_explorer/components/images/textfield_background_disabled.png diff --git a/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_normal.png b/examples/QtSensors/QtSensors_sensor_explorer/components/images/textfield_background_normal.png Binary files differindex b90b50c..b90b50c 100644 --- a/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_normal.png +++ b/examples/QtSensors/QtSensors_sensor_explorer/components/images/textfield_background_normal.png diff --git a/examples/sensors/sensor_explorer/qml_app/images/listitem_select.png b/examples/QtSensors/QtSensors_sensor_explorer/content/listitem_select.png Binary files differindex def234f..def234f 100644 --- a/examples/sensors/sensor_explorer/qml_app/images/listitem_select.png +++ b/examples/QtSensors/QtSensors_sensor_explorer/content/listitem_select.png diff --git a/examples/sensors/sensor_explorer/qml_app/icon.png b/examples/QtSensors/QtSensors_sensor_explorer/icon.png Binary files differindex c48b609..c48b609 100644 --- a/examples/sensors/sensor_explorer/qml_app/icon.png +++ b/examples/QtSensors/QtSensors_sensor_explorer/icon.png diff --git a/examples/sensors/sensor_explorer/import/explorer.cpp b/examples/QtSensors/QtSensors_sensor_explorer/import/explorer.cpp index 0c29619..0c29619 100644 --- a/examples/sensors/sensor_explorer/import/explorer.cpp +++ b/examples/QtSensors/QtSensors_sensor_explorer/import/explorer.cpp diff --git a/examples/sensors/sensor_explorer/import/explorer.h b/examples/QtSensors/QtSensors_sensor_explorer/import/explorer.h index f8806b6..eaac810 100644 --- a/examples/sensors/sensor_explorer/import/explorer.h +++ b/examples/QtSensors/QtSensors_sensor_explorer/import/explorer.h @@ -42,7 +42,7 @@ #ifndef QSEONSOREXPLORER_H #define QSEONSOREXPLORER_H -#include <QtQml/qqml.h> +#include <QtQml/QtQml> #include <QtQml/QQmlListProperty> #include "sensoritem.h" diff --git a/examples/sensors/sensor_explorer/import/import.pro b/examples/QtSensors/QtSensors_sensor_explorer/import/import.pro index 1f97b67..1f97b67 100644 --- a/examples/sensors/sensor_explorer/import/import.pro +++ b/examples/QtSensors/QtSensors_sensor_explorer/import/import.pro diff --git a/examples/sensors/sensor_explorer/import/main.cpp b/examples/QtSensors/QtSensors_sensor_explorer/import/main.cpp index e0b3ad9..80e2510 100644 --- a/examples/sensors/sensor_explorer/import/main.cpp +++ b/examples/QtSensors/QtSensors_sensor_explorer/import/main.cpp @@ -38,8 +38,8 @@ ** ****************************************************************************/ -#include <QtQml/qqmlextensionplugin.h> -#include <QtQml/qqml.h> +#include <QtQml/QQmlExtensionPlugin> +#include <QtQml/QtQml> #include "explorer.h" #include <QtCore/QDebug> diff --git a/examples/sensors/grue/import/plugin.json b/examples/QtSensors/QtSensors_sensor_explorer/import/plugin.json index 0967ef4..0967ef4 100644 --- a/examples/sensors/grue/import/plugin.json +++ b/examples/QtSensors/QtSensors_sensor_explorer/import/plugin.json diff --git a/examples/sensors/sensor_explorer/import/propertyinfo.cpp b/examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.cpp index 0360e0d..0360e0d 100644 --- a/examples/sensors/sensor_explorer/import/propertyinfo.cpp +++ b/examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.cpp diff --git a/examples/sensors/sensor_explorer/import/propertyinfo.h b/examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.h index dd8eecf..b3ebe4c 100644 --- a/examples/sensors/sensor_explorer/import/propertyinfo.h +++ b/examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.h @@ -42,7 +42,7 @@ #ifndef QPROPERTYINFO_H #define QPROPERTYINFO_H -#include <QtQml/qqml.h> +#include <QtQml/QtQml> #include <QtCore/QString> QT_BEGIN_NAMESPACE diff --git a/examples/sensors/sensor_explorer/import/qmldir b/examples/QtSensors/QtSensors_sensor_explorer/import/qmldir index 60d8f88..60d8f88 100644 --- a/examples/sensors/sensor_explorer/import/qmldir +++ b/examples/QtSensors/QtSensors_sensor_explorer/import/qmldir diff --git a/examples/sensors/sensor_explorer/import/sensoritem.cpp b/examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.cpp index 68dccf4..68dccf4 100644 --- a/examples/sensors/sensor_explorer/import/sensoritem.cpp +++ b/examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.cpp diff --git a/examples/sensors/sensor_explorer/import/sensoritem.h b/examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.h index 0931367..b937687 100644 --- a/examples/sensors/sensor_explorer/import/sensoritem.h +++ b/examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.h @@ -42,7 +42,7 @@ #ifndef QSENSORITEM_H #define QSENSORITEM_H -#include <QtQml/qqml.h> +#include <QtQml/QtQml> #include <QtCore/QString> #include "propertyinfo.h" diff --git a/examples/QtSensors/QtSensors_sensor_explorer/info.json b/examples/QtSensors/QtSensors_sensor_explorer/info.json new file mode 100644 index 0000000..18f3e8d --- /dev/null +++ b/examples/QtSensors/QtSensors_sensor_explorer/info.json @@ -0,0 +1,15 @@ +{ + "info-version": "1.0", + "dict": { + "category": "application", + "runtime": "qml", + "displayName": { + "en_US": "Sensors Explorer" + }, + "subcategory": "utility", + "main": "QtSensors_sensor_explorer.qml", + "version": "1.0.0", + "identifier": "com.nokia.mt.sensorexplorer", + "author": "Qt" + } +} diff --git a/examples/sensors/sensor_explorer/qml_app/qml_app.pro b/examples/QtSensors/QtSensors_sensor_explorer/qml.pro index ded6634..bc4f858 100644 --- a/examples/sensors/sensor_explorer/qml_app/qml_app.pro +++ b/examples/QtSensors/QtSensors_sensor_explorer/qml.pro @@ -1,13 +1,13 @@ TEMPLATE = aux app.files = \ - PropertyList.qml \ - components \ - images \ info.json \ + QtSensors_sensor_explorer.qml \ + PropertyList.qml \ SensorList.qml \ icon.png \ - main.qml + components \ + content MT_SYSROOT=$$(MT_SYSROOT) !isEmpty(MT_SYSROOT):EXAMPLES_PREFIX=/opt/mt/applications diff --git a/examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.pro b/examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.pro new file mode 100644 index 0000000..6dc685b --- /dev/null +++ b/examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs + +SUBDIRS = qml.pro diff --git a/examples/sensors/shakeit/shakeit.qml b/examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml index e2a2254..50ef8de 100644 --- a/examples/sensors/shakeit/shakeit.qml +++ b/examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml @@ -71,19 +71,19 @@ Rectangle { Image { id: triangle1 smooth: true - source: "images/triangle.png" + source: "content/triangle.png" x: parent.width / 2 - (triangle1.width / 2) y: parent.height / 2 - (triangle1.height); Behavior on x { SmoothedAnimation { velocity: 200 } } Behavior on y { SmoothedAnimation { velocity: 200 } } transform: Rotation { id: myRot - } + } } Image { id: triangle2 smooth: true - source: "images/triangle2.png" + source: "content/triangle2.png" x: parent.width / 2 - (triangle1.width + triangle2.width / 2) y: parent.height / 2 + (triangle2.height / 2); Behavior on x { SmoothedAnimation { velocity: 200 } } @@ -92,7 +92,7 @@ Rectangle { Image { id: triangle3 smooth: true - source: "images/triangle3.png" + source: "content/triangle3.png" x: parent.width / 2 + (triangle1.width / 2) y: parent.height / 2 + (triangle3.height / 2); diff --git a/examples/sensors/shakeit/audio/loopy2a_mono.wav b/examples/QtSensors/QtSensors_shakeit/audio/loopy2a_mono.wav Binary files differindex 7d76cb6..7d76cb6 100644 --- a/examples/sensors/shakeit/audio/loopy2a_mono.wav +++ b/examples/QtSensors/QtSensors_shakeit/audio/loopy2a_mono.wav diff --git a/examples/sensors/shakeit/audio/phone.wav b/examples/QtSensors/QtSensors_shakeit/audio/phone.wav Binary files differindex 884e9ac..884e9ac 100644 --- a/examples/sensors/shakeit/audio/phone.wav +++ b/examples/QtSensors/QtSensors_shakeit/audio/phone.wav diff --git a/examples/sensors/shakeit/images/triangle.png b/examples/QtSensors/QtSensors_shakeit/content/triangle.png Binary files differindex f366537..f366537 100644 --- a/examples/sensors/shakeit/images/triangle.png +++ b/examples/QtSensors/QtSensors_shakeit/content/triangle.png diff --git a/examples/sensors/shakeit/images/triangle2.png b/examples/QtSensors/QtSensors_shakeit/content/triangle2.png Binary files differindex 9318d5a..9318d5a 100644 --- a/examples/sensors/shakeit/images/triangle2.png +++ b/examples/QtSensors/QtSensors_shakeit/content/triangle2.png diff --git a/examples/sensors/shakeit/images/triangle3.png b/examples/QtSensors/QtSensors_shakeit/content/triangle3.png Binary files differindex 4cc5ccd..4cc5ccd 100644 --- a/examples/sensors/shakeit/images/triangle3.png +++ b/examples/QtSensors/QtSensors_shakeit/content/triangle3.png diff --git a/examples/sensors/shakeit/icon.png b/examples/QtSensors/QtSensors_shakeit/icon.png Binary files differindex d8f2154..d8f2154 100644 --- a/examples/sensors/shakeit/icon.png +++ b/examples/QtSensors/QtSensors_shakeit/icon.png diff --git a/examples/QtSensors/QtSensors_shakeit/info.json b/examples/QtSensors/QtSensors_shakeit/info.json new file mode 100644 index 0000000..a98f6f2 --- /dev/null +++ b/examples/QtSensors/QtSensors_shakeit/info.json @@ -0,0 +1,14 @@ +{ + "info-version": "1.0", + "dict": { + "displayName": { + "en_US": "ShakeIt!" + }, + "identifier": "com.nokia.mt.shakeit", + "runtime": "qml", + "main": "QtSensors_shakeit.qml", + "version": "1.0.0", + "category": "application", + "subcategory": "utility" + } +} diff --git a/examples/sensors/shakeit/shakeit.pro b/examples/QtSensors/QtSensors_shakeit/qml.pro index 5c71541..a56249d 100644 --- a/examples/sensors/shakeit/shakeit.pro +++ b/examples/QtSensors/QtSensors_shakeit/qml.pro @@ -2,10 +2,10 @@ TEMPLATE = aux app.files = \ info.json \ - shakeit.qml \ + QtSensors_shakeit.qml \ icon.png \ audio \ - images + content MT_SYSROOT=$$(MT_SYSROOT) !isEmpty(MT_SYSROOT):EXAMPLES_PREFIX=/opt/mt/applications diff --git a/examples/sensors/accel/accel.pro b/examples/QtSensors/accel/accel.pro index 86303ec..86303ec 100644 --- a/examples/sensors/accel/accel.pro +++ b/examples/QtSensors/accel/accel.pro diff --git a/examples/sensors/accel/main.cpp b/examples/QtSensors/accel/main.cpp index 012c8c6..012c8c6 100644 --- a/examples/sensors/accel/main.cpp +++ b/examples/QtSensors/accel/main.cpp diff --git a/examples/sensors/accelbubble/accelbubble.pro b/examples/QtSensors/accelbubble/accelbubble.pro index feeec68..feeec68 100644 --- a/examples/sensors/accelbubble/accelbubble.pro +++ b/examples/QtSensors/accelbubble/accelbubble.pro diff --git a/examples/sensors/accelbubble/icon.png b/examples/QtSensors/accelbubble/icon.png Binary files differindex d74f111..d74f111 100644 --- a/examples/sensors/accelbubble/icon.png +++ b/examples/QtSensors/accelbubble/icon.png diff --git a/examples/sensors/accelbubble/images/Bluebubble2.png b/examples/QtSensors/accelbubble/images/Bluebubble2.png Binary files differindex f96126e..f96126e 100644 --- a/examples/sensors/accelbubble/images/Bluebubble2.png +++ b/examples/QtSensors/accelbubble/images/Bluebubble2.png diff --git a/examples/sensors/accelbubble/info.json b/examples/QtSensors/accelbubble/info.json index 9a2ed70..9a2ed70 100644 --- a/examples/sensors/accelbubble/info.json +++ b/examples/QtSensors/accelbubble/info.json diff --git a/examples/sensors/accelbubble/main.qml b/examples/QtSensors/accelbubble/main.qml index 487ee3f..487ee3f 100644 --- a/examples/sensors/accelbubble/main.qml +++ b/examples/QtSensors/accelbubble/main.qml diff --git a/examples/sensors/cubehouse/Cube.qml b/examples/QtSensors/cubehouse/Cube.qml index c174b8f..c174b8f 100644 --- a/examples/sensors/cubehouse/Cube.qml +++ b/examples/QtSensors/cubehouse/Cube.qml diff --git a/examples/sensors/cubehouse/Cubehouse.qml b/examples/QtSensors/cubehouse/Cubehouse.qml index 5a1b91f..5a1b91f 100644 --- a/examples/sensors/cubehouse/Cubehouse.qml +++ b/examples/QtSensors/cubehouse/Cubehouse.qml diff --git a/examples/sensors/cubehouse/Room.qml b/examples/QtSensors/cubehouse/Room.qml index 43af3b1..43af3b1 100644 --- a/examples/sensors/cubehouse/Room.qml +++ b/examples/QtSensors/cubehouse/Room.qml diff --git a/examples/sensors/cubehouse/Table.qml b/examples/QtSensors/cubehouse/Table.qml index 683d28d..683d28d 100644 --- a/examples/sensors/cubehouse/Table.qml +++ b/examples/QtSensors/cubehouse/Table.qml diff --git a/examples/sensors/cubehouse/cubehouse.pro b/examples/QtSensors/cubehouse/cubehouse.pro index 075ec4e..075ec4e 100644 --- a/examples/sensors/cubehouse/cubehouse.pro +++ b/examples/QtSensors/cubehouse/cubehouse.pro diff --git a/examples/sensors/cubehouse/icon.png b/examples/QtSensors/cubehouse/icon.png Binary files differindex 193ad56..193ad56 100644 --- a/examples/sensors/cubehouse/icon.png +++ b/examples/QtSensors/cubehouse/icon.png diff --git a/examples/sensors/cubehouse/images/ground.jpg b/examples/QtSensors/cubehouse/images/ground.jpg Binary files differindex 2664b99..2664b99 100644 --- a/examples/sensors/cubehouse/images/ground.jpg +++ b/examples/QtSensors/cubehouse/images/ground.jpg diff --git a/examples/sensors/cubehouse/images/qtlogo.png b/examples/QtSensors/cubehouse/images/qtlogo.png Binary files differindex 7d3e97e..7d3e97e 100644 --- a/examples/sensors/cubehouse/images/qtlogo.png +++ b/examples/QtSensors/cubehouse/images/qtlogo.png diff --git a/examples/sensors/cubehouse/images/roof.jpg b/examples/QtSensors/cubehouse/images/roof.jpg Binary files differindex 53a35d6..53a35d6 100644 --- a/examples/sensors/cubehouse/images/roof.jpg +++ b/examples/QtSensors/cubehouse/images/roof.jpg diff --git a/examples/sensors/cubehouse/images/wall.jpg b/examples/QtSensors/cubehouse/images/wall.jpg Binary files differindex 7c56e23..7c56e23 100644 --- a/examples/sensors/cubehouse/images/wall.jpg +++ b/examples/QtSensors/cubehouse/images/wall.jpg diff --git a/examples/sensors/cubehouse/info.json b/examples/QtSensors/cubehouse/info.json index 39e39a8..39e39a8 100644 --- a/examples/sensors/cubehouse/info.json +++ b/examples/QtSensors/cubehouse/info.json diff --git a/examples/sensors/cubehouse/mesh/table.3ds b/examples/QtSensors/cubehouse/mesh/table.3ds Binary files differindex 3e576bd..3e576bd 100644 --- a/examples/sensors/cubehouse/mesh/table.3ds +++ b/examples/QtSensors/cubehouse/mesh/table.3ds diff --git a/examples/sensors/grue/console_app/console_app.pro b/examples/QtSensors/grue/console_app/console_app.pro index 33d4317..33d4317 100644 --- a/examples/sensors/grue/console_app/console_app.pro +++ b/examples/QtSensors/grue/console_app/console_app.pro diff --git a/examples/sensors/grue/console_app/main.cpp b/examples/QtSensors/grue/console_app/main.cpp index dc62e4d..dc62e4d 100644 --- a/examples/sensors/grue/console_app/main.cpp +++ b/examples/QtSensors/grue/console_app/main.cpp diff --git a/examples/sensors/grue/grue.pro b/examples/QtSensors/grue/grue.pro index 0405286..0405286 100644 --- a/examples/sensors/grue/grue.pro +++ b/examples/QtSensors/grue/grue.pro diff --git a/examples/sensors/grue/import/import.pro b/examples/QtSensors/grue/import/import.pro index 753e1ef..753e1ef 100644 --- a/examples/sensors/grue/import/import.pro +++ b/examples/QtSensors/grue/import/import.pro diff --git a/examples/sensors/grue/import/main.cpp b/examples/QtSensors/grue/import/main.cpp index 6c32703..6c32703 100644 --- a/examples/sensors/grue/import/main.cpp +++ b/examples/QtSensors/grue/import/main.cpp diff --git a/examples/sensors/sensor_explorer/import/plugin.json b/examples/QtSensors/grue/import/plugin.json index 0967ef4..0967ef4 100644 --- a/examples/sensors/sensor_explorer/import/plugin.json +++ b/examples/QtSensors/grue/import/plugin.json diff --git a/examples/sensors/grue/import/qmldir b/examples/QtSensors/grue/import/qmldir index 266b7c1..266b7c1 100644 --- a/examples/sensors/grue/import/qmldir +++ b/examples/QtSensors/grue/import/qmldir diff --git a/examples/sensors/grue/lib/gruesensor.cpp b/examples/QtSensors/grue/lib/gruesensor.cpp index b1f00ed..b1f00ed 100644 --- a/examples/sensors/grue/lib/gruesensor.cpp +++ b/examples/QtSensors/grue/lib/gruesensor.cpp diff --git a/examples/sensors/grue/lib/gruesensor.h b/examples/QtSensors/grue/lib/gruesensor.h index 8088988..8088988 100644 --- a/examples/sensors/grue/lib/gruesensor.h +++ b/examples/QtSensors/grue/lib/gruesensor.h diff --git a/examples/sensors/grue/lib/gruesensor_p.h b/examples/QtSensors/grue/lib/gruesensor_p.h index 4996e86..4996e86 100644 --- a/examples/sensors/grue/lib/gruesensor_p.h +++ b/examples/QtSensors/grue/lib/gruesensor_p.h diff --git a/examples/sensors/grue/lib/lib.pro b/examples/QtSensors/grue/lib/lib.pro index e048e60..e048e60 100644 --- a/examples/sensors/grue/lib/lib.pro +++ b/examples/QtSensors/grue/lib/lib.pro diff --git a/examples/sensors/grue/plugin/gruesensorimpl.cpp b/examples/QtSensors/grue/plugin/gruesensorimpl.cpp index e7152a6..e7152a6 100644 --- a/examples/sensors/grue/plugin/gruesensorimpl.cpp +++ b/examples/QtSensors/grue/plugin/gruesensorimpl.cpp diff --git a/examples/sensors/grue/plugin/gruesensorimpl.h b/examples/QtSensors/grue/plugin/gruesensorimpl.h index ed89711..ed89711 100644 --- a/examples/sensors/grue/plugin/gruesensorimpl.h +++ b/examples/QtSensors/grue/plugin/gruesensorimpl.h diff --git a/examples/sensors/grue/plugin/main.cpp b/examples/QtSensors/grue/plugin/main.cpp index 36aec29..36aec29 100644 --- a/examples/sensors/grue/plugin/main.cpp +++ b/examples/QtSensors/grue/plugin/main.cpp diff --git a/examples/sensors/grue/plugin/plugin.json b/examples/QtSensors/grue/plugin/plugin.json index 8a55b3a..8a55b3a 100644 --- a/examples/sensors/grue/plugin/plugin.json +++ b/examples/QtSensors/grue/plugin/plugin.json diff --git a/examples/sensors/grue/plugin/plugin.pro b/examples/QtSensors/grue/plugin/plugin.pro index 32e127f..32e127f 100644 --- a/examples/sensors/grue/plugin/plugin.pro +++ b/examples/QtSensors/grue/plugin/plugin.pro diff --git a/examples/sensors/grue/qml_app/grue.png b/examples/QtSensors/grue/qml_app/grue.png Binary files differindex f0b070b..f0b070b 100644 --- a/examples/sensors/grue/qml_app/grue.png +++ b/examples/QtSensors/grue/qml_app/grue.png diff --git a/examples/sensors/grue/qml_app/grue.xcf b/examples/QtSensors/grue/qml_app/grue.xcf Binary files differindex 2837ed7..2837ed7 100644 --- a/examples/sensors/grue/qml_app/grue.xcf +++ b/examples/QtSensors/grue/qml_app/grue.xcf diff --git a/examples/sensors/grue/qml_app/icon.png b/examples/QtSensors/grue/qml_app/icon.png Binary files differindex f3f038c..f3f038c 100644 --- a/examples/sensors/grue/qml_app/icon.png +++ b/examples/QtSensors/grue/qml_app/icon.png diff --git a/examples/sensors/grue/qml_app/icon.xcf b/examples/QtSensors/grue/qml_app/icon.xcf Binary files differindex 8416c49..8416c49 100644 --- a/examples/sensors/grue/qml_app/icon.xcf +++ b/examples/QtSensors/grue/qml_app/icon.xcf diff --git a/examples/sensors/grue/qml_app/info.json b/examples/QtSensors/grue/qml_app/info.json index 2e14fc7..2e14fc7 100644 --- a/examples/sensors/grue/qml_app/info.json +++ b/examples/QtSensors/grue/qml_app/info.json diff --git a/examples/sensors/grue/qml_app/main.qml b/examples/QtSensors/grue/qml_app/main.qml index 05d267c..05d267c 100644 --- a/examples/sensors/grue/qml_app/main.qml +++ b/examples/QtSensors/grue/qml_app/main.qml diff --git a/examples/sensors/grue/qml_app/qml_app.pro b/examples/QtSensors/grue/qml_app/qml_app.pro index c017dcc..c017dcc 100644 --- a/examples/sensors/grue/qml_app/qml_app.pro +++ b/examples/QtSensors/grue/qml_app/qml_app.pro diff --git a/examples/sensors/qmlsensorgestures/plugin/plugin.json b/examples/QtSensors/qmlsensorgestures/plugin/plugin.json index 8a55b3a..8a55b3a 100644 --- a/examples/sensors/qmlsensorgestures/plugin/plugin.json +++ b/examples/QtSensors/qmlsensorgestures/plugin/plugin.json diff --git a/examples/sensors/qmlsensorgestures/plugin/plugin.pro b/examples/QtSensors/qmlsensorgestures/plugin/plugin.pro index 2003e91..2003e91 100644 --- a/examples/sensors/qmlsensorgestures/plugin/plugin.pro +++ b/examples/QtSensors/qmlsensorgestures/plugin/plugin.pro diff --git a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp b/examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp index 1fda187..1fda187 100644 --- a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp +++ b/examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp diff --git a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h b/examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.h index 4755f96..4755f96 100644 --- a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h +++ b/examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.h diff --git a/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp b/examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp index 03319e8..03319e8 100644 --- a/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp +++ b/examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp diff --git a/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.h b/examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.h index 37c16eb..37c16eb 100644 --- a/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.h +++ b/examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.h diff --git a/examples/sensors/qmlsensorgestures/qml_app/Button.qml b/examples/QtSensors/qmlsensorgestures/qml_app/Button.qml index 23fc0f6..23fc0f6 100644 --- a/examples/sensors/qmlsensorgestures/qml_app/Button.qml +++ b/examples/QtSensors/qmlsensorgestures/qml_app/Button.qml diff --git a/examples/sensors/qmlsensorgestures/qml_app/Gesture.qml b/examples/QtSensors/qmlsensorgestures/qml_app/Gesture.qml index 2982c09..2982c09 100644 --- a/examples/sensors/qmlsensorgestures/qml_app/Gesture.qml +++ b/examples/QtSensors/qmlsensorgestures/qml_app/Gesture.qml diff --git a/examples/sensors/qmlsensorgestures/qml_app/GestureList.qml b/examples/QtSensors/qmlsensorgestures/qml_app/GestureList.qml index c9b1f09..c9b1f09 100644 --- a/examples/sensors/qmlsensorgestures/qml_app/GestureList.qml +++ b/examples/QtSensors/qmlsensorgestures/qml_app/GestureList.qml diff --git a/examples/sensors/qmlsensorgestures/qml_app/GestureView.qml b/examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml index 07a9a5c..07a9a5c 100644 --- a/examples/sensors/qmlsensorgestures/qml_app/GestureView.qml +++ b/examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml diff --git a/examples/sensors/qmlsensorgestures/qml_app/GesturesView.qml b/examples/QtSensors/qmlsensorgestures/qml_app/GesturesView.qml index 23924ca..23924ca 100644 --- a/examples/sensors/qmlsensorgestures/qml_app/GesturesView.qml +++ b/examples/QtSensors/qmlsensorgestures/qml_app/GesturesView.qml diff --git a/examples/sensors/qmlsensorgestures/qml_app/icon.png b/examples/QtSensors/qmlsensorgestures/qml_app/icon.png Binary files differindex c445bd7..c445bd7 100644 --- a/examples/sensors/qmlsensorgestures/qml_app/icon.png +++ b/examples/QtSensors/qmlsensorgestures/qml_app/icon.png diff --git a/examples/sensors/qmlsensorgestures/qml_app/info.json b/examples/QtSensors/qmlsensorgestures/qml_app/info.json index 063caaa..063caaa 100644 --- a/examples/sensors/qmlsensorgestures/qml_app/info.json +++ b/examples/QtSensors/qmlsensorgestures/qml_app/info.json diff --git a/examples/sensors/qmlsensorgestures/qml_app/qml_app.pro b/examples/QtSensors/qmlsensorgestures/qml_app/qml_app.pro index 6ad9a8b..6ad9a8b 100644 --- a/examples/sensors/qmlsensorgestures/qml_app/qml_app.pro +++ b/examples/QtSensors/qmlsensorgestures/qml_app/qml_app.pro diff --git a/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro b/examples/QtSensors/qmlsensorgestures/qmlsensorgestures.pro index 01677c1..01677c1 100644 --- a/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro +++ b/examples/QtSensors/qmlsensorgestures/qmlsensorgestures.pro diff --git a/examples/sensors/sensorgestures/gesture.png b/examples/QtSensors/sensorgestures/gesture.png Binary files differindex 707d5c4..707d5c4 100644 --- a/examples/sensors/sensorgestures/gesture.png +++ b/examples/QtSensors/sensorgestures/gesture.png diff --git a/examples/sensors/sensorgestures/main.cpp b/examples/QtSensors/sensorgestures/main.cpp index 49594d4..49594d4 100644 --- a/examples/sensors/sensorgestures/main.cpp +++ b/examples/QtSensors/sensorgestures/main.cpp diff --git a/examples/sensors/sensorgestures/mainwindow.cpp b/examples/QtSensors/sensorgestures/mainwindow.cpp index 9dd8a61..9dd8a61 100644 --- a/examples/sensors/sensorgestures/mainwindow.cpp +++ b/examples/QtSensors/sensorgestures/mainwindow.cpp diff --git a/examples/sensors/sensorgestures/mainwindow.h b/examples/QtSensors/sensorgestures/mainwindow.h index 1e38f1b..1e38f1b 100644 --- a/examples/sensors/sensorgestures/mainwindow.h +++ b/examples/QtSensors/sensorgestures/mainwindow.h diff --git a/examples/sensors/sensorgestures/mainwindow.ui b/examples/QtSensors/sensorgestures/mainwindow.ui index baccf98..baccf98 100644 --- a/examples/sensors/sensorgestures/mainwindow.ui +++ b/examples/QtSensors/sensorgestures/mainwindow.ui diff --git a/examples/sensors/sensorgestures/sensorgestures.pro b/examples/QtSensors/sensorgestures/sensorgestures.pro index 295db94..295db94 100644 --- a/examples/sensors/sensorgestures/sensorgestures.pro +++ b/examples/QtSensors/sensorgestures/sensorgestures.pro diff --git a/examples/examples.pro b/examples/examples.pro index 0685c62..9437540 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += sensors +SUBDIRS += QtSensors diff --git a/examples/sensors/maze/info.json b/examples/sensors/maze/info.json deleted file mode 100644 index 3aa2369..0000000 --- a/examples/sensors/maze/info.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Maze", - "Subcategory": "utility", - "MainQML": "Maze.qml", - "Version": "1.0.0", - "Identifier": "com.nokia.mt.maze", - "Summary": "Labyrinth game using TiltSensor", - "Author": "Qt" - } -} diff --git a/examples/sensors/qmlqtsensors/info.json b/examples/sensors/qmlqtsensors/info.json deleted file mode 100644 index d76c300..0000000 --- a/examples/sensors/qmlqtsensors/info.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "QML QtSensors", - "Subcategory": "utility", - "MainQML": "main.qml", - "Version": "1.0.0", - "Identifier": "com.nokia.mt.qmlqtsensors", - "Summary": "QML Qt Sensors demo", - "Author": "Qt" - } -} diff --git a/examples/sensors/sensor_explorer/qml_app/info.json b/examples/sensors/sensor_explorer/qml_app/info.json deleted file mode 100644 index ce7e0c3..0000000 --- a/examples/sensors/sensor_explorer/qml_app/info.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Sensors Explorer", - "Subcategory": "utility", - "MainQML": "main.qml", - "Version": "1.0.0", - "Identifier": "com.nokia.mt.sensor_explorer", - "Summary": "QML Sensors Explorer demo", - "Author": "Qt" - } -} - diff --git a/examples/sensors/shakeit/info.json b/examples/sensors/shakeit/info.json deleted file mode 100644 index 1895469..0000000 --- a/examples/sensors/shakeit/info.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "DisplayName": "ShakeIt!", - "Identifier": "com.nokia.mt.shakeit", - "Runtime": "qml", - "MainQML": "shakeit.qml", - "Version": "1.0.0", - "Category": "application", - "Subcategory": "utility", - "Summary": "ShakeIt demonstrates the Qt5 QtSensor Gestures API" - } -} diff --git a/src/imports/sensors2/qsensor2ambientlight.cpp b/src/imports/sensors2/qsensor2ambientlight.cpp index b24a8b0..28f46ed 100644 --- a/src/imports/sensors2/qsensor2ambientlight.cpp +++ b/src/imports/sensors2/qsensor2ambientlight.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE This element is part of the \b{QtSensors 5} module. - The \l {Qt Sensors - Simple QML Example} is an example how to use this QML element. + The \l {Qt Sensors - QML example} is an example how to use this QML element. */ QSensor2AmbientLight::QSensor2AmbientLight(QObject* parent) : qsensor2common(parent) diff --git a/src/imports/sensors2/qsensor2proximity.cpp b/src/imports/sensors2/qsensor2proximity.cpp index c0ef957..d126dc9 100644 --- a/src/imports/sensors2/qsensor2proximity.cpp +++ b/src/imports/sensors2/qsensor2proximity.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE This element is part of the \b{QtSensors 5} module. - The \l {Qt Sensors - Simple QML Example} is an example how to use this QML element. + The \l {Qt Sensors - QML example} is an example how to use this QML element. */ diff --git a/src/imports/sensors2/qsensor2tilt.cpp b/src/imports/sensors2/qsensor2tilt.cpp index b0d85a5..99d4a60 100644 --- a/src/imports/sensors2/qsensor2tilt.cpp +++ b/src/imports/sensors2/qsensor2tilt.cpp @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE This element is part of the \b{QtSensors 5} module. - The \l {Qt Sensors - Simple QML Example} is an example how to use this QML element. + The \l {Qt Sensors - QML example} is an example how to use this QML element. */ QSensor2Tilt::QSensor2Tilt(QObject* parent) |