diff options
author | Wolfgang Beck <wolfgang.beck@nokia.com> | 2012-05-25 12:31:38 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-28 05:02:44 +0200 |
commit | 5effd1712aa6f1ae2359762cdadeb70198121f77 (patch) | |
tree | d7a48be78f910d7e957252b36a5dbf6f57e786bf /examples | |
parent | dd14ea8acf97103868d6dfcafb7b19275e605e97 (diff) | |
download | qtsensors-5effd1712aa6f1ae2359762cdadeb70198121f77.tar.gz |
Update Examples using the same name conventions
e.g. Folder of example should start with QtSensorrs_
Example documentation title should start with QtSensors -
images folder renamed to content
Change-Id: I341fb8510ba3ad64068d786559e8d28af5d135c3
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/QtSensors/QtSensors.pro | 12 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_accel/QtSensors_accel.pro (renamed from examples/QtSensors/accel/accel.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_accel/main.cpp (renamed from examples/QtSensors/accel/main.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.pro (renamed from examples/QtSensors/accelbubble/accelbubble.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml (renamed from examples/QtSensors/accelbubble/main.qml) | 2 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_accelbubble/content/Bluebubble2.png (renamed from examples/QtSensors/accelbubble/images/Bluebubble2.png) | bin | 12815 -> 12815 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_accelbubble/icon.png (renamed from examples/QtSensors/accelbubble/icon.png) | bin | 2034 -> 2034 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_accelbubble/info.json (renamed from examples/QtSensors/accelbubble/info.json) | 2 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_cubehouse/Cube.qml (renamed from examples/QtSensors/cubehouse/Cube.qml) | 2 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.pro (renamed from examples/QtSensors/cubehouse/cubehouse.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml (renamed from examples/QtSensors/cubehouse/Cubehouse.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_cubehouse/Room.qml (renamed from examples/QtSensors/cubehouse/Room.qml) | 12 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_cubehouse/Table.qml (renamed from examples/QtSensors/cubehouse/Table.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_cubehouse/content/ground.jpg (renamed from examples/QtSensors/cubehouse/images/ground.jpg) | bin | 3077 -> 3077 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_cubehouse/content/qtlogo.png (renamed from examples/QtSensors/cubehouse/images/qtlogo.png) | bin | 13923 -> 13923 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_cubehouse/content/roof.jpg (renamed from examples/QtSensors/cubehouse/images/roof.jpg) | bin | 3866 -> 3866 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_cubehouse/content/wall.jpg (renamed from examples/QtSensors/cubehouse/images/wall.jpg) | bin | 6195 -> 6195 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_cubehouse/icon.png (renamed from examples/QtSensors/cubehouse/icon.png) | bin | 7607 -> 7607 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_cubehouse/info.json (renamed from examples/QtSensors/cubehouse/info.json) | 2 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_cubehouse/mesh/table.3ds (renamed from examples/QtSensors/cubehouse/mesh/table.3ds) | bin | 9149 -> 9149 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/QtSensors_grue.pro (renamed from examples/QtSensors/grue/grue.pro) | 2 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/QtSensors_grue.qml (renamed from examples/QtSensors/grue/qml_app/main.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/console_app/console_app.pro (renamed from examples/QtSensors/grue/console_app/console_app.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/console_app/main.cpp (renamed from examples/QtSensors/grue/console_app/main.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/grue.png (renamed from examples/QtSensors/grue/qml_app/grue.png) | bin | 11207 -> 11207 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/grue.xcf (renamed from examples/QtSensors/grue/qml_app/grue.xcf) | bin | 23704 -> 23704 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/icon.png (renamed from examples/QtSensors/grue/qml_app/icon.png) | bin | 7951 -> 7951 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/icon.xcf (renamed from examples/QtSensors/grue/qml_app/icon.xcf) | bin | 22397 -> 22397 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/import/import.pro (renamed from examples/QtSensors/grue/import/import.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/import/main.cpp (renamed from examples/QtSensors/grue/import/main.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/import/plugin.json (renamed from examples/QtSensors/grue/import/plugin.json) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/import/qmldir (renamed from examples/QtSensors/grue/import/qmldir) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/info.json (renamed from examples/QtSensors/grue/qml_app/info.json) | 2 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/lib/gruesensor.cpp (renamed from examples/QtSensors/grue/lib/gruesensor.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/lib/gruesensor.h (renamed from examples/QtSensors/grue/lib/gruesensor.h) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/lib/gruesensor_p.h (renamed from examples/QtSensors/grue/lib/gruesensor_p.h) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/lib/lib.pro (renamed from examples/QtSensors/grue/lib/lib.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.cpp (renamed from examples/QtSensors/grue/plugin/gruesensorimpl.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.h (renamed from examples/QtSensors/grue/plugin/gruesensorimpl.h) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/plugin/main.cpp (renamed from examples/QtSensors/grue/plugin/main.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/plugin/plugin.json (renamed from examples/QtSensors/grue/plugin/plugin.json) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/plugin/plugin.pro (renamed from examples/QtSensors/grue/plugin/plugin.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_grue/qml.pro (renamed from examples/QtSensors/grue/qml_app/qml_app.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlsensorgestures/Button.qml (renamed from examples/QtSensors/qmlsensorgestures/qml_app/Button.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlsensorgestures/GestureList.qml (renamed from examples/QtSensors/qmlsensorgestures/qml_app/GestureList.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml (renamed from examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlsensorgestures/GesturesView.qml (renamed from examples/QtSensors/qmlsensorgestures/qml_app/GesturesView.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.pro | 6 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.qml (renamed from examples/QtSensors/qmlsensorgestures/qml_app/Gesture.qml) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlsensorgestures/icon.png (renamed from examples/QtSensors/qmlsensorgestures/qml_app/icon.png) | bin | 2298 -> 2298 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlsensorgestures/info.json (renamed from examples/QtSensors/qmlsensorgestures/qml_app/info.json) | 2 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlsensorgestures/plugin/plugin.json (renamed from examples/QtSensors/qmlsensorgestures/plugin/plugin.json) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlsensorgestures/plugin/plugin.pro (renamed from examples/QtSensors/qmlsensorgestures/plugin/plugin.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcountergestureplugin.cpp (renamed from examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcountergestureplugin.h (renamed from examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.h) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcounterrecognizer.cpp (renamed from examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcounterrecognizer.h (renamed from examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.h) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_qmlsensorgestures/qml.pro (renamed from examples/QtSensors/qmlsensorgestures/qml_app/qml_app.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensorgestures/QtSensors_sensorgestures.pro (renamed from examples/QtSensors/sensorgestures/sensorgestures.pro) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensorgestures/gesture.png (renamed from examples/QtSensors/sensorgestures/gesture.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/QtSensors/QtSensors_sensorgestures/main.cpp (renamed from examples/QtSensors/sensorgestures/main.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensorgestures/mainwindow.cpp (renamed from examples/QtSensors/sensorgestures/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensorgestures/mainwindow.h (renamed from examples/QtSensors/sensorgestures/mainwindow.h) | 0 | ||||
-rw-r--r-- | examples/QtSensors/QtSensors_sensorgestures/mainwindow.ui (renamed from examples/QtSensors/sensorgestures/mainwindow.ui) | 0 | ||||
-rw-r--r-- | examples/QtSensors/qmlsensorgestures/qmlsensorgestures.pro | 5 |
65 files changed, 25 insertions, 24 deletions
diff --git a/examples/QtSensors/QtSensors.pro b/examples/QtSensors/QtSensors.pro index 3e64991..fd775ab 100644 --- a/examples/QtSensors/QtSensors.pro +++ b/examples/QtSensors/QtSensors.pro @@ -1,16 +1,16 @@ TEMPLATE = subdirs SUBDIRS += \ - accel \ - accelbubble \ - cubehouse \ - grue \ - qmlsensorgestures \ + QtSensors_accel \ + QtSensors_accelbubble \ + QtSensors_cubehouse \ + QtSensors_grue \ + QtSensors_qmlsensorgestures \ QtSensors_maze \ QtSensors_qmlqtsensors \ QtSensors_sensor_explorer \ QtSensors_shakeit !isEmpty(QT.widgets.name):SUBDIRS += \ - sensorgestures + QtSensors_sensorgestures diff --git a/examples/QtSensors/accel/accel.pro b/examples/QtSensors/QtSensors_accel/QtSensors_accel.pro index 86303ec..86303ec 100644 --- a/examples/QtSensors/accel/accel.pro +++ b/examples/QtSensors/QtSensors_accel/QtSensors_accel.pro diff --git a/examples/QtSensors/accel/main.cpp b/examples/QtSensors/QtSensors_accel/main.cpp index 012c8c6..012c8c6 100644 --- a/examples/QtSensors/accel/main.cpp +++ b/examples/QtSensors/QtSensors_accel/main.cpp diff --git a/examples/QtSensors/accelbubble/accelbubble.pro b/examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.pro index feeec68..feeec68 100644 --- a/examples/QtSensors/accelbubble/accelbubble.pro +++ b/examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.pro diff --git a/examples/QtSensors/accelbubble/main.qml b/examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml index 487ee3f..2117698 100644 --- a/examples/QtSensors/accelbubble/main.qml +++ b/examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml @@ -83,7 +83,7 @@ Rectangle { Image { id: bubble - source: "images/Bluebubble2.png" + source: "content/Bluebubble2.png" property real centerX: parent.width / 2 property real centerY: parent.height / 2; property real bubbleCenter: bubble.width / 2 diff --git a/examples/QtSensors/accelbubble/images/Bluebubble2.png b/examples/QtSensors/QtSensors_accelbubble/content/Bluebubble2.png Binary files differindex f96126e..f96126e 100644 --- a/examples/QtSensors/accelbubble/images/Bluebubble2.png +++ b/examples/QtSensors/QtSensors_accelbubble/content/Bluebubble2.png diff --git a/examples/QtSensors/accelbubble/icon.png b/examples/QtSensors/QtSensors_accelbubble/icon.png Binary files differindex d74f111..d74f111 100644 --- a/examples/QtSensors/accelbubble/icon.png +++ b/examples/QtSensors/QtSensors_accelbubble/icon.png diff --git a/examples/QtSensors/accelbubble/info.json b/examples/QtSensors/QtSensors_accelbubble/info.json index 80c81bd..b91dd9f 100644 --- a/examples/QtSensors/accelbubble/info.json +++ b/examples/QtSensors/QtSensors_accelbubble/info.json @@ -6,7 +6,7 @@ }, "identifier": "com.nokia.mt.accelbubble", "runtime": "qml", - "main": "main.qml", + "main": "QtSensors_accelbubble.qml", "version": "1.0.0", "category": "application", "subcategory": "utility" diff --git a/examples/QtSensors/cubehouse/Cube.qml b/examples/QtSensors/QtSensors_cubehouse/Cube.qml index c174b8f..b8afe81 100644 --- a/examples/QtSensors/cubehouse/Cube.qml +++ b/examples/QtSensors/QtSensors_cubehouse/Cube.qml @@ -75,7 +75,7 @@ Cube { effect: Effect { color: "#aaca00" - texture: "images/qtlogo.png" + texture: "content/qtlogo.png" decal: true } } diff --git a/examples/QtSensors/cubehouse/cubehouse.pro b/examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.pro index 075ec4e..075ec4e 100644 --- a/examples/QtSensors/cubehouse/cubehouse.pro +++ b/examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.pro diff --git a/examples/QtSensors/cubehouse/Cubehouse.qml b/examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml index 5a1b91f..5a1b91f 100644 --- a/examples/QtSensors/cubehouse/Cubehouse.qml +++ b/examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml diff --git a/examples/QtSensors/cubehouse/Room.qml b/examples/QtSensors/QtSensors_cubehouse/Room.qml index 43af3b1..848735b 100644 --- a/examples/QtSensors/cubehouse/Room.qml +++ b/examples/QtSensors/QtSensors_cubehouse/Room.qml @@ -105,7 +105,7 @@ Item3D{ id: frontWall scale: room.scale effect: Effect { - texture: "images/wall.jpg" + texture: "content/wall.jpg" } transform: [ Translation3D { @@ -130,7 +130,7 @@ Item3D{ id: ground scale: room.scale effect: Effect { - texture: "images/ground.jpg" + texture: "content/ground.jpg" } transform: [ Translation3D { @@ -155,7 +155,7 @@ Item3D{ id: leftWall scale: room.scale effect: Effect { - texture: "images/wall.jpg" + texture: "content/wall.jpg" } transform: [ Translation3D { @@ -180,7 +180,7 @@ Item3D{ id: rightWall scale: room.scale effect: Effect { - texture: "images/wall.jpg" + texture: "content/wall.jpg" } transform: [ Translation3D { @@ -205,7 +205,7 @@ Item3D{ id: roof scale: room.scale effect: Effect { - texture: "images/roof.jpg" + texture: "content/roof.jpg" } transform: [ Translation3D { @@ -230,7 +230,7 @@ Item3D{ id: backWall scale: room.scale effect: Effect { - texture: "images/wall.jpg" + texture: "content/wall.jpg" } transform: [ Translation3D { diff --git a/examples/QtSensors/cubehouse/Table.qml b/examples/QtSensors/QtSensors_cubehouse/Table.qml index 683d28d..683d28d 100644 --- a/examples/QtSensors/cubehouse/Table.qml +++ b/examples/QtSensors/QtSensors_cubehouse/Table.qml diff --git a/examples/QtSensors/cubehouse/images/ground.jpg b/examples/QtSensors/QtSensors_cubehouse/content/ground.jpg Binary files differindex 2664b99..2664b99 100644 --- a/examples/QtSensors/cubehouse/images/ground.jpg +++ b/examples/QtSensors/QtSensors_cubehouse/content/ground.jpg diff --git a/examples/QtSensors/cubehouse/images/qtlogo.png b/examples/QtSensors/QtSensors_cubehouse/content/qtlogo.png Binary files differindex 7d3e97e..7d3e97e 100644 --- a/examples/QtSensors/cubehouse/images/qtlogo.png +++ b/examples/QtSensors/QtSensors_cubehouse/content/qtlogo.png diff --git a/examples/QtSensors/cubehouse/images/roof.jpg b/examples/QtSensors/QtSensors_cubehouse/content/roof.jpg Binary files differindex 53a35d6..53a35d6 100644 --- a/examples/QtSensors/cubehouse/images/roof.jpg +++ b/examples/QtSensors/QtSensors_cubehouse/content/roof.jpg diff --git a/examples/QtSensors/cubehouse/images/wall.jpg b/examples/QtSensors/QtSensors_cubehouse/content/wall.jpg Binary files differindex 7c56e23..7c56e23 100644 --- a/examples/QtSensors/cubehouse/images/wall.jpg +++ b/examples/QtSensors/QtSensors_cubehouse/content/wall.jpg diff --git a/examples/QtSensors/cubehouse/icon.png b/examples/QtSensors/QtSensors_cubehouse/icon.png Binary files differindex 193ad56..193ad56 100644 --- a/examples/QtSensors/cubehouse/icon.png +++ b/examples/QtSensors/QtSensors_cubehouse/icon.png diff --git a/examples/QtSensors/cubehouse/info.json b/examples/QtSensors/QtSensors_cubehouse/info.json index 8d297c0..7b1c5af 100644 --- a/examples/QtSensors/cubehouse/info.json +++ b/examples/QtSensors/QtSensors_cubehouse/info.json @@ -6,7 +6,7 @@ }, "identifier": "com.nokia.mt.cubehouse", "runtime": "qml", - "main": "Cubehouse.qml", + "main": "QtSensors_cubehouse.qml", "version": "1.0.0", "category": "application", "subcategory": "utility" diff --git a/examples/QtSensors/cubehouse/mesh/table.3ds b/examples/QtSensors/QtSensors_cubehouse/mesh/table.3ds Binary files differindex 3e576bd..3e576bd 100644 --- a/examples/QtSensors/cubehouse/mesh/table.3ds +++ b/examples/QtSensors/QtSensors_cubehouse/mesh/table.3ds diff --git a/examples/QtSensors/grue/grue.pro b/examples/QtSensors/QtSensors_grue/QtSensors_grue.pro index 0405286..de917bf 100644 --- a/examples/QtSensors/grue/grue.pro +++ b/examples/QtSensors/QtSensors_grue/QtSensors_grue.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs SUBDIRS += lib plugin console_app -SUBDIRS += import qml_app +SUBDIRS += import qml.pro plugin.depends = lib import.depends = lib diff --git a/examples/QtSensors/grue/qml_app/main.qml b/examples/QtSensors/QtSensors_grue/QtSensors_grue.qml index 05d267c..05d267c 100644 --- a/examples/QtSensors/grue/qml_app/main.qml +++ b/examples/QtSensors/QtSensors_grue/QtSensors_grue.qml diff --git a/examples/QtSensors/grue/console_app/console_app.pro b/examples/QtSensors/QtSensors_grue/console_app/console_app.pro index 33d4317..33d4317 100644 --- a/examples/QtSensors/grue/console_app/console_app.pro +++ b/examples/QtSensors/QtSensors_grue/console_app/console_app.pro diff --git a/examples/QtSensors/grue/console_app/main.cpp b/examples/QtSensors/QtSensors_grue/console_app/main.cpp index dc62e4d..dc62e4d 100644 --- a/examples/QtSensors/grue/console_app/main.cpp +++ b/examples/QtSensors/QtSensors_grue/console_app/main.cpp diff --git a/examples/QtSensors/grue/qml_app/grue.png b/examples/QtSensors/QtSensors_grue/grue.png Binary files differindex f0b070b..f0b070b 100644 --- a/examples/QtSensors/grue/qml_app/grue.png +++ b/examples/QtSensors/QtSensors_grue/grue.png diff --git a/examples/QtSensors/grue/qml_app/grue.xcf b/examples/QtSensors/QtSensors_grue/grue.xcf Binary files differindex 2837ed7..2837ed7 100644 --- a/examples/QtSensors/grue/qml_app/grue.xcf +++ b/examples/QtSensors/QtSensors_grue/grue.xcf diff --git a/examples/QtSensors/grue/qml_app/icon.png b/examples/QtSensors/QtSensors_grue/icon.png Binary files differindex f3f038c..f3f038c 100644 --- a/examples/QtSensors/grue/qml_app/icon.png +++ b/examples/QtSensors/QtSensors_grue/icon.png diff --git a/examples/QtSensors/grue/qml_app/icon.xcf b/examples/QtSensors/QtSensors_grue/icon.xcf Binary files differindex 8416c49..8416c49 100644 --- a/examples/QtSensors/grue/qml_app/icon.xcf +++ b/examples/QtSensors/QtSensors_grue/icon.xcf diff --git a/examples/QtSensors/grue/import/import.pro b/examples/QtSensors/QtSensors_grue/import/import.pro index 753e1ef..753e1ef 100644 --- a/examples/QtSensors/grue/import/import.pro +++ b/examples/QtSensors/QtSensors_grue/import/import.pro diff --git a/examples/QtSensors/grue/import/main.cpp b/examples/QtSensors/QtSensors_grue/import/main.cpp index 6c32703..6c32703 100644 --- a/examples/QtSensors/grue/import/main.cpp +++ b/examples/QtSensors/QtSensors_grue/import/main.cpp diff --git a/examples/QtSensors/grue/import/plugin.json b/examples/QtSensors/QtSensors_grue/import/plugin.json index 0967ef4..0967ef4 100644 --- a/examples/QtSensors/grue/import/plugin.json +++ b/examples/QtSensors/QtSensors_grue/import/plugin.json diff --git a/examples/QtSensors/grue/import/qmldir b/examples/QtSensors/QtSensors_grue/import/qmldir index 266b7c1..266b7c1 100644 --- a/examples/QtSensors/grue/import/qmldir +++ b/examples/QtSensors/QtSensors_grue/import/qmldir diff --git a/examples/QtSensors/grue/qml_app/info.json b/examples/QtSensors/QtSensors_grue/info.json index 700c3eb..7512905 100644 --- a/examples/QtSensors/grue/qml_app/info.json +++ b/examples/QtSensors/QtSensors_grue/info.json @@ -6,7 +6,7 @@ }, "identifier": "com.nokia.mt.grue", "runtime": "qml", - "main": "main.qml", + "main": "QtSensors_grue.qml", "version": "1.0.0", "category": "application", "subcategory": "utility" diff --git a/examples/QtSensors/grue/lib/gruesensor.cpp b/examples/QtSensors/QtSensors_grue/lib/gruesensor.cpp index b1f00ed..b1f00ed 100644 --- a/examples/QtSensors/grue/lib/gruesensor.cpp +++ b/examples/QtSensors/QtSensors_grue/lib/gruesensor.cpp diff --git a/examples/QtSensors/grue/lib/gruesensor.h b/examples/QtSensors/QtSensors_grue/lib/gruesensor.h index 8088988..8088988 100644 --- a/examples/QtSensors/grue/lib/gruesensor.h +++ b/examples/QtSensors/QtSensors_grue/lib/gruesensor.h diff --git a/examples/QtSensors/grue/lib/gruesensor_p.h b/examples/QtSensors/QtSensors_grue/lib/gruesensor_p.h index 4996e86..4996e86 100644 --- a/examples/QtSensors/grue/lib/gruesensor_p.h +++ b/examples/QtSensors/QtSensors_grue/lib/gruesensor_p.h diff --git a/examples/QtSensors/grue/lib/lib.pro b/examples/QtSensors/QtSensors_grue/lib/lib.pro index e048e60..e048e60 100644 --- a/examples/QtSensors/grue/lib/lib.pro +++ b/examples/QtSensors/QtSensors_grue/lib/lib.pro diff --git a/examples/QtSensors/grue/plugin/gruesensorimpl.cpp b/examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.cpp index e7152a6..e7152a6 100644 --- a/examples/QtSensors/grue/plugin/gruesensorimpl.cpp +++ b/examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.cpp diff --git a/examples/QtSensors/grue/plugin/gruesensorimpl.h b/examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.h index ed89711..ed89711 100644 --- a/examples/QtSensors/grue/plugin/gruesensorimpl.h +++ b/examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.h diff --git a/examples/QtSensors/grue/plugin/main.cpp b/examples/QtSensors/QtSensors_grue/plugin/main.cpp index 36aec29..36aec29 100644 --- a/examples/QtSensors/grue/plugin/main.cpp +++ b/examples/QtSensors/QtSensors_grue/plugin/main.cpp diff --git a/examples/QtSensors/grue/plugin/plugin.json b/examples/QtSensors/QtSensors_grue/plugin/plugin.json index 8a55b3a..8a55b3a 100644 --- a/examples/QtSensors/grue/plugin/plugin.json +++ b/examples/QtSensors/QtSensors_grue/plugin/plugin.json diff --git a/examples/QtSensors/grue/plugin/plugin.pro b/examples/QtSensors/QtSensors_grue/plugin/plugin.pro index 32e127f..32e127f 100644 --- a/examples/QtSensors/grue/plugin/plugin.pro +++ b/examples/QtSensors/QtSensors_grue/plugin/plugin.pro diff --git a/examples/QtSensors/grue/qml_app/qml_app.pro b/examples/QtSensors/QtSensors_grue/qml.pro index c017dcc..c017dcc 100644 --- a/examples/QtSensors/grue/qml_app/qml_app.pro +++ b/examples/QtSensors/QtSensors_grue/qml.pro diff --git a/examples/QtSensors/qmlsensorgestures/qml_app/Button.qml b/examples/QtSensors/QtSensors_qmlsensorgestures/Button.qml index 23fc0f6..23fc0f6 100644 --- a/examples/QtSensors/qmlsensorgestures/qml_app/Button.qml +++ b/examples/QtSensors/QtSensors_qmlsensorgestures/Button.qml diff --git a/examples/QtSensors/qmlsensorgestures/qml_app/GestureList.qml b/examples/QtSensors/QtSensors_qmlsensorgestures/GestureList.qml index c9b1f09..c9b1f09 100644 --- a/examples/QtSensors/qmlsensorgestures/qml_app/GestureList.qml +++ b/examples/QtSensors/QtSensors_qmlsensorgestures/GestureList.qml diff --git a/examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml b/examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml index 07a9a5c..07a9a5c 100644 --- a/examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml +++ b/examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml diff --git a/examples/QtSensors/qmlsensorgestures/qml_app/GesturesView.qml b/examples/QtSensors/QtSensors_qmlsensorgestures/GesturesView.qml index 23924ca..23924ca 100644 --- a/examples/QtSensors/qmlsensorgestures/qml_app/GesturesView.qml +++ b/examples/QtSensors/QtSensors_qmlsensorgestures/GesturesView.qml diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.pro b/examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.pro new file mode 100644 index 0000000..011f5f9 --- /dev/null +++ b/examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.pro @@ -0,0 +1,6 @@ +TEMPLATE = subdirs +CONFIG += ordered + +SUBDIRS = \ + plugin \ + qml.pro diff --git a/examples/QtSensors/qmlsensorgestures/qml_app/Gesture.qml b/examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.qml index 2982c09..2982c09 100644 --- a/examples/QtSensors/qmlsensorgestures/qml_app/Gesture.qml +++ b/examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.qml diff --git a/examples/QtSensors/qmlsensorgestures/qml_app/icon.png b/examples/QtSensors/QtSensors_qmlsensorgestures/icon.png Binary files differindex c445bd7..c445bd7 100644 --- a/examples/QtSensors/qmlsensorgestures/qml_app/icon.png +++ b/examples/QtSensors/QtSensors_qmlsensorgestures/icon.png diff --git a/examples/QtSensors/qmlsensorgestures/qml_app/info.json b/examples/QtSensors/QtSensors_qmlsensorgestures/info.json index 02e1e0a..57241da 100644 --- a/examples/QtSensors/qmlsensorgestures/qml_app/info.json +++ b/examples/QtSensors/QtSensors_qmlsensorgestures/info.json @@ -6,7 +6,7 @@ }, "identifier": "com.nokia.mt.qmlsensorsgesture", "runtime": "qml", - "main": "Gesture.qml", + "main": "QtSensors_qmlsensorgestures.qml", "version": "1.0.0", "category": "application", "subcategory": "utility" diff --git a/examples/QtSensors/qmlsensorgestures/plugin/plugin.json b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/plugin.json index 8a55b3a..8a55b3a 100644 --- a/examples/QtSensors/qmlsensorgestures/plugin/plugin.json +++ b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/plugin.json diff --git a/examples/QtSensors/qmlsensorgestures/plugin/plugin.pro b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/plugin.pro index 2003e91..2003e91 100644 --- a/examples/QtSensors/qmlsensorgestures/plugin/plugin.pro +++ b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/plugin.pro diff --git a/examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcountergestureplugin.cpp index 1fda187..1fda187 100644 --- a/examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp +++ b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcountergestureplugin.cpp diff --git a/examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.h b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcountergestureplugin.h index 4755f96..4755f96 100644 --- a/examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.h +++ b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcountergestureplugin.h diff --git a/examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcounterrecognizer.cpp index 03319e8..03319e8 100644 --- a/examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp +++ b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcounterrecognizer.cpp diff --git a/examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.h b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcounterrecognizer.h index 37c16eb..37c16eb 100644 --- a/examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.h +++ b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcounterrecognizer.h diff --git a/examples/QtSensors/qmlsensorgestures/qml_app/qml_app.pro b/examples/QtSensors/QtSensors_qmlsensorgestures/qml.pro index 6ad9a8b..6ad9a8b 100644 --- a/examples/QtSensors/qmlsensorgestures/qml_app/qml_app.pro +++ b/examples/QtSensors/QtSensors_qmlsensorgestures/qml.pro diff --git a/examples/QtSensors/sensorgestures/sensorgestures.pro b/examples/QtSensors/QtSensors_sensorgestures/QtSensors_sensorgestures.pro index 295db94..295db94 100644 --- a/examples/QtSensors/sensorgestures/sensorgestures.pro +++ b/examples/QtSensors/QtSensors_sensorgestures/QtSensors_sensorgestures.pro diff --git a/examples/QtSensors/sensorgestures/gesture.png b/examples/QtSensors/QtSensors_sensorgestures/gesture.png Binary files differindex 707d5c4..707d5c4 100644 --- a/examples/QtSensors/sensorgestures/gesture.png +++ b/examples/QtSensors/QtSensors_sensorgestures/gesture.png diff --git a/examples/QtSensors/sensorgestures/main.cpp b/examples/QtSensors/QtSensors_sensorgestures/main.cpp index 49594d4..49594d4 100644 --- a/examples/QtSensors/sensorgestures/main.cpp +++ b/examples/QtSensors/QtSensors_sensorgestures/main.cpp diff --git a/examples/QtSensors/sensorgestures/mainwindow.cpp b/examples/QtSensors/QtSensors_sensorgestures/mainwindow.cpp index 9dd8a61..9dd8a61 100644 --- a/examples/QtSensors/sensorgestures/mainwindow.cpp +++ b/examples/QtSensors/QtSensors_sensorgestures/mainwindow.cpp diff --git a/examples/QtSensors/sensorgestures/mainwindow.h b/examples/QtSensors/QtSensors_sensorgestures/mainwindow.h index 1e38f1b..1e38f1b 100644 --- a/examples/QtSensors/sensorgestures/mainwindow.h +++ b/examples/QtSensors/QtSensors_sensorgestures/mainwindow.h diff --git a/examples/QtSensors/sensorgestures/mainwindow.ui b/examples/QtSensors/QtSensors_sensorgestures/mainwindow.ui index baccf98..baccf98 100644 --- a/examples/QtSensors/sensorgestures/mainwindow.ui +++ b/examples/QtSensors/QtSensors_sensorgestures/mainwindow.ui diff --git a/examples/QtSensors/qmlsensorgestures/qmlsensorgestures.pro b/examples/QtSensors/qmlsensorgestures/qmlsensorgestures.pro deleted file mode 100644 index 01677c1..0000000 --- a/examples/QtSensors/qmlsensorgestures/qmlsensorgestures.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += plugin -SUBDIRS += qml_app - |