Update the examples.

Use .pro files, no .qmlproject files.
Remove unused settings.json and notions.json files.
Install to EXAMPLES_PREFIX when it is defined.
Dest paths match info.json identifiers.
No execute bit on non-executable files.

Change-Id: Ib09320bd976b8aec7512531ce11ed92f05912dde
Reviewed-by: Wolfgang Beck <wolfgang.beck@nokia.com>

58 files changed, 137 insertions, 311 deletions

diff --git a/examples/sensors/accelbubble/accelbubble.pro b/examples/sensors/accelbubble/accelbubble.pro
new file mode 100644
index 0000000..8d7e176
--- /dev/null
+++ b/examples/sensors/accelbubble/accelbubble.pro
@@ -0,0 +1,13 @@
+TEMPLATE = aux
+
+app.files = \
+    info.json \
+    main.qml \
+    icon.png \
+    images
+
+!isEmpty(EXAMPLES_PREFIX) {
+    app.path = $$EXAMPLES_PREFIX/com.nokia.mt.accelbubble
+    INSTALLS = app
+}
+
diff --git a/examples/sensors/accelbubble/accelbubble.qmlproject b/examples/sensors/accelbubble/accelbubble.qmlproject
deleted file mode 100644
index 4d32f75..0000000
--- a/examples/sensors/accelbubble/accelbubble.qmlproject
+++ /dev/null
@@ -1,18 +0,0 @@
-import QmlProject 1.1
-
-Project {
-    mainFile: "main.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ "../exampleplugin" ]
-}
diff --git a/examples/sensors/accelbubble/icon.png b/examples/sensors/accelbubble/icon.png
index 9127d43..d74f111 100644
--- a/examples/sensors/accelbubble/icon.png
+++ b/examples/sensors/accelbubble/icon.png
diff --git a/examples/sensors/accelbubble/info.json b/examples/sensors/accelbubble/info.json
index 3679988..9a2ed70 100644
--- a/examples/sensors/accelbubble/info.json
+++ b/examples/sensors/accelbubble/info.json
@@ -7,7 +7,7 @@
         "Subcategory": "utility",
         "MainQML": "main.qml",
         "Version": "1.0",
-        "Identifier": "com.nokia.mt.accelbubble.demo",
+        "Identifier": "com.nokia.mt.accelbubble",
         "Summary": "QtSensors Accel Bubble",
         "Author": "Qt"
     }
diff --git a/examples/sensors/cubehouse/cubehouse.pro b/examples/sensors/cubehouse/cubehouse.pro
new file mode 100644
index 0000000..c7847f3
--- /dev/null
+++ b/examples/sensors/cubehouse/cubehouse.pro
@@ -0,0 +1,17 @@
+TEMPLATE = aux
+
+app.files = \
+    Cube.qml \
+    Cubehouse.qml \
+    Room.qml \
+    Table.qml \
+    icon.png \
+    images \
+    info.json \
+    mesh
+
+!isEmpty(EXAMPLES_PREFIX) {
+    app.path = $$EXAMPLES_PREFIX/com.nokia.mt.cubehouse
+    INSTALLS = app
+}
+
diff --git a/examples/sensors/cubehouse/cubehouse.qmlproject b/examples/sensors/cubehouse/cubehouse.qmlproject
deleted file mode 100644
index 3147dfe..0000000
--- a/examples/sensors/cubehouse/cubehouse.qmlproject
+++ /dev/null
@@ -1,18 +0,0 @@
-import QmlProject 1.1
-
-Project {
-    mainFile: "Cubehouse.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "./images"
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ "../exampleplugin" ]
-}
diff --git a/examples/sensors/cubehouse/info.json b/examples/sensors/cubehouse/info.json
index effbfb0..39e39a8 100644
--- a/examples/sensors/cubehouse/info.json
+++ b/examples/sensors/cubehouse/info.json
@@ -7,7 +7,7 @@
         "Subcategory": "utility",
         "MainQML": "Cubehouse.qml",
         "Version": "1.0",
-        "Identifier": "com.nokia.mt.cubehouse.demo",
+        "Identifier": "com.nokia.mt.cubehouse",
         "Summary": "Cubehouse using Accelerometer",
         "Author": "Qt"
     }
diff --git a/examples/sensors/grue/grue.pro b/examples/sensors/grue/grue.pro
index 5af352b..0405286 100644
--- a/examples/sensors/grue/grue.pro
+++ b/examples/sensors/grue/grue.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs
 
 SUBDIRS += lib plugin console_app
-SUBDIRS += import #qml_app
+SUBDIRS += import qml_app
 
 plugin.depends = lib
 import.depends = lib
diff --git a/examples/sensors/grue/import/import.pro b/examples/sensors/grue/import/import.pro
index 0bb108f..98277dd 100644
--- a/examples/sensors/grue/import/import.pro
+++ b/examples/sensors/grue/import/import.pro
@@ -1,7 +1,8 @@
-TARGET = declarative_grue
-TARGETPATH = Grue
+TEMPLATE = lib
+CONFIG += plugin
 
-include(qsensorsimport.pri)
+TARGET = $$qtLibraryTarget(declarative_grue)
+TARGETPATH = Grue
 
 QT = core gui declarative sensors
 
@@ -10,12 +11,7 @@ LIBS += -L$$OUT_PWD/../lib -lgruesensor
 
 SOURCES = main.cpp
 
-symbian {
-    TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = ALL -TCB
-}
-
-!isEmpty(EXAMPLES_PREFIX):DESTPATH=$$EXAMPLES_PREFIX/grue/imports/Grue
+!isEmpty(EXAMPLES_PREFIX):DESTPATH=$$EXAMPLES_PREFIX/com.nokia.mt.grue/imports/Grue
 else:DESTPATH=$$[QT_INSTALL_IMPORTS]/Grue
 
 target.path=$$DESTPATH
diff --git a/examples/sensors/grue/import/qsensorsimport.pri b/examples/sensors/grue/import/qsensorsimport.pri
deleted file mode 100644
index b8af2b7..0000000
--- a/examples/sensors/grue/import/qsensorsimport.pri
+++ /dev/null
@@ -1,27 +0,0 @@
-load(qt_module)
-
-symbian:load(qt_plugin)
-TEMPLATE = lib
-CONFIG += qt plugin
-
-win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
-
-isEmpty(TARGETPATH) {
-    error("qimportbase.pri: You must provide a TARGETPATH!")
-}
-isEmpty(TARGET) {
-    error("qimportbase.pri: You must provide a TARGET!")
-}
-
-TARGET = $$qtLibraryTarget($$TARGET)
-contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-
-load(qt_targets)
-
-wince*:LIBS += $$QMAKE_LIBS_GUI
-
-symbian: {
-    TARGET.EPOCALLOWDLLDATA=1
-    TARGET.CAPABILITY = All -Tcb
-    load(armcc_warnings)
-}
diff --git a/examples/sensors/grue/lib/lib.pro b/examples/sensors/grue/lib/lib.pro
index 8ff9b31..7e087ba 100644
--- a/examples/sensors/grue/lib/lib.pro
+++ b/examples/sensors/grue/lib/lib.pro
@@ -12,11 +12,6 @@ HEADERS += gruesensor.h\
 
 SOURCES += gruesensor.cpp\
 
-symbian {
-    TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = ALL -TCB
-}
-
 target.path=$$[QT_INSTALL_LIBS]
 INSTALLS += target
 
diff --git a/examples/sensors/grue/plugin/plugin.pro b/examples/sensors/grue/plugin/plugin.pro
index d325e00..90d7a01 100644
--- a/examples/sensors/grue/plugin/plugin.pro
+++ b/examples/sensors/grue/plugin/plugin.pro
@@ -13,11 +13,6 @@ HEADERS += gruesensorimpl.h\
 SOURCES += gruesensorimpl.cpp\
            main.cpp\
 
-symbian {
-    TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = ALL -TCB
-}
-
 target.path=$$[QT_INSTALL_PLUGINS]/sensors
 INSTALLS += target
 
diff --git a/examples/sensors/grue/qml_app/info.json b/examples/sensors/grue/qml_app/info.json
index e60fa3c..2e14fc7 100644
--- a/examples/sensors/grue/qml_app/info.json
+++ b/examples/sensors/grue/qml_app/info.json
@@ -1,12 +1,12 @@
 {
-  "info-version": "1.0",
-  "dict": {
-     "DisplayName": "Grue Sensor",
-     "Identifier": "com.nokia.mt.grue.demo",
-     "Runtime": "qml",
-     "MainQML": "main.qml",
-     "Version": "1.0.0",
-     "Category": "application",
-     "Summary": "The Grue sensor identifies your chance of being eaten by a Grue."
-  }
+    "info-version": "1.0",
+    "dict": {
+        "DisplayName": "Grue Sensor",
+        "Identifier": "com.nokia.mt.grue",
+        "Runtime": "qml",
+        "MainQML": "main.qml",
+        "Version": "1.0.0",
+        "Category": "application",
+        "Summary": "The Grue sensor identifies your chance of being eaten by a Grue."
+    }
 }
diff --git a/examples/sensors/grue/qml_app/qml_app.pro b/examples/sensors/grue/qml_app/qml_app.pro
new file mode 100644
index 0000000..47c6c14
--- /dev/null
+++ b/examples/sensors/grue/qml_app/qml_app.pro
@@ -0,0 +1,12 @@
+TEMPLATE = aux
+
+app.files = \
+    icon.png \
+    info.json \
+    main.qml
+
+!isEmpty(EXAMPLES_PREFIX) {
+    app.path = $$EXAMPLES_PREFIX/com.nokia.mt.grue
+    INSTALLS = app
+}
+
diff --git a/examples/sensors/grue/qml_app/qml_app.qmlproject b/examples/sensors/grue/qml_app/qml_app.qmlproject
deleted file mode 100644
index 2218c43..0000000
--- a/examples/sensors/grue/qml_app/qml_app.qmlproject
+++ /dev/null
@@ -1,20 +0,0 @@
-/* File generated by Qt Creator, version 2.2.0 */
-
-import QmlProject 1.1
-
-Project {
-    mainFile: "main.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ "../exampleplugin" ]
-}
diff --git a/examples/sensors/maze/icon.png b/examples/sensors/maze/icon.png
index 1e7ff8d..1e7ff8d 100755..100644
--- a/examples/sensors/maze/icon.png
+++ b/examples/sensors/maze/icon.png
diff --git a/examples/sensors/maze/maze.pro b/examples/sensors/maze/maze.pro
index a15e39e..7239eed 100644
--- a/examples/sensors/maze/maze.pro
+++ b/examples/sensors/maze/maze.pro
@@ -1,4 +1,18 @@
-TEMPLATE = subdirs
+TEMPLATE = aux
 
-SUBDIRS = qml.pro
+app.files = \
+    Congratulation.qml \
+    Maze.qml \
+    components \
+    images \
+    lib.js \
+    LabyrinthSquare.qml \
+    Mouse.qml \
+    icon.png \
+    info.json
+
+!isEmpty(EXAMPLES_PREFIX) {
+    app.path = $$EXAMPLES_PREFIX/com.nokia.mt.maze
+    INSTALLS = app
+}
 
diff --git a/examples/sensors/maze/notions.json b/examples/sensors/maze/notions.json
deleted file mode 100644
index 95d0519..0000000
--- a/examples/sensors/maze/notions.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "notion-file-version": 1,
-   "capabilities": [
-   ]
-}
diff --git a/examples/sensors/maze/qml.pro b/examples/sensors/maze/qml.pro
deleted file mode 100644
index 2e6dbc2..0000000
--- a/examples/sensors/maze/qml.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-TEMPLATE = aux
-
-app.files = \
-    info.json \
-    notions.json \
-    settings.json \
-    Congratulation.qml \
-    LabyrinthSquare.qml \
-    lib.js \
-    Maze.qml \
-    Mouse.qml \
-    icon.png \
-    components \
-    images
-
-!isEmpty(EXAMPLES_PREFIX) {
-    TARGET_DIR = $$EXAMPLES_PREFIX/com.nokia.mt.maze
-    app.path = $$TARGET_DIR
-    INSTALLS += app
-}
diff --git a/examples/sensors/maze/settings.json b/examples/sensors/maze/settings.json
deleted file mode 100644
index 5300076..0000000
--- a/examples/sensors/maze/settings.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "version": "1.0.0",
-  "identifier": "com.nokia.mt.maze",
-  "label": "Labyrinth game using TiltSensor",
-  "settings": [
-  ]
-}
diff --git a/examples/sensors/qmlqtsensors/icon.png b/examples/sensors/qmlqtsensors/icon.png
index d3243c5..d3243c5 100755..100644
--- a/examples/sensors/qmlqtsensors/icon.png
+++ b/examples/sensors/qmlqtsensors/icon.png
diff --git a/examples/sensors/qmlqtsensors/notions.json b/examples/sensors/qmlqtsensors/notions.json
deleted file mode 100644
index 95d0519..0000000
--- a/examples/sensors/qmlqtsensors/notions.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "notion-file-version": 1,
-   "capabilities": [
-   ]
-}
diff --git a/examples/sensors/qmlqtsensors/qml.pro b/examples/sensors/qmlqtsensors/qml.pro
deleted file mode 100644
index 6838887..0000000
--- a/examples/sensors/qmlqtsensors/qml.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-TEMPLATE = aux
-
-app.files = \
-    info.json \
-    notions.json \
-    settings.json \
-    main.qml \
-    icon.png \
-    components
-
-!isEmpty(EXAMPLES_PREFIX) {
-    TARGET_DIR = $$EXAMPLES_PREFIX/com.nokia.mt.qmlqtsensors
-    app.path = $$TARGET_DIR
-    INSTALLS = app
-}
-
diff --git a/examples/sensors/qmlqtsensors/qmlqtsensors.pro b/examples/sensors/qmlqtsensors/qmlqtsensors.pro
index a15e39e..84f38f6 100644
--- a/examples/sensors/qmlqtsensors/qmlqtsensors.pro
+++ b/examples/sensors/qmlqtsensors/qmlqtsensors.pro
@@ -1,4 +1,13 @@
-TEMPLATE = subdirs
+TEMPLATE = aux
 
-SUBDIRS = qml.pro
+app.files = \
+    info.json \
+    main.qml \
+    icon.png \
+    components
+
+!isEmpty(EXAMPLES_PREFIX) {
+    app.path = $$EXAMPLES_PREFIX/com.nokia.mt.qmlqtsensors
+    INSTALLS = app
+}
 
diff --git a/examples/sensors/qmlqtsensors/settings.json b/examples/sensors/qmlqtsensors/settings.json
deleted file mode 100644
index c0d2876..0000000
--- a/examples/sensors/qmlqtsensors/settings.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "version": "1.0.0",
-  "identifier": "com.nokia.mt.qmlqtsensors",
-  "label": "QML Qt Sensors demo",
-  "settings": [
-  ]
-}
diff --git a/examples/sensors/qmlsensorgestures/plugin/plugin.pro b/examples/sensors/qmlsensorgestures/plugin/plugin.pro
index ab25088..0e9cb1a 100644
--- a/examples/sensors/qmlsensorgestures/plugin/plugin.pro
+++ b/examples/sensors/qmlsensorgestures/plugin/plugin.pro
@@ -6,7 +6,6 @@ TARGET = qtsensorgestures_counterplugin
 QT += sensors
 DESTDIR = $$QT.sensors.plugins/sensorgestures
 
-# Input
 HEADERS += \
     qcountergestureplugin.h \
     qcounterrecognizer.h
@@ -17,11 +16,3 @@ SOURCES += \
 target.path += $$[QT_INSTALL_PLUGINS]/sensorgestures
 INSTALLS += target
 
-
-
-
-
-
-
-
-
diff --git a/examples/sensors/qmlsensorgestures/qml_app/icon.png b/examples/sensors/qmlsensorgestures/qml_app/icon.png
index c445bd7..c445bd7 100755..100644
--- a/examples/sensors/qmlsensorgestures/qml_app/icon.png
+++ b/examples/sensors/qmlsensorgestures/qml_app/icon.png
diff --git a/examples/sensors/qmlsensorgestures/qml_app/info.json b/examples/sensors/qmlsensorgestures/qml_app/info.json
index 39a6219..063caaa 100644
--- a/examples/sensors/qmlsensorgestures/qml_app/info.json
+++ b/examples/sensors/qmlsensorgestures/qml_app/info.json
@@ -7,7 +7,7 @@
       "Subcategory": "utility",
       "MainQML": "Gesture.qml",
       "Version": "1.0",
-      "Identifier": "com.nokia.mt.qmlsensorsgesture.demo",
+      "Identifier": "com.nokia.mt.qmlsensorsgesture",
       "Summary": "QML Sensors Gesture demo",
       "Author": "Qt"
   }
diff --git a/examples/sensors/qmlsensorgestures/qml_app/qml_app.pro b/examples/sensors/qmlsensorgestures/qml_app/qml_app.pro
new file mode 100644
index 0000000..f7741f4
--- /dev/null
+++ b/examples/sensors/qmlsensorgestures/qml_app/qml_app.pro
@@ -0,0 +1,16 @@
+TEMPLATE = aux
+
+app.files = \
+    Button.qml \
+    GestureList.qml \
+    GesturesView.qml \
+    info.json \
+    Gesture.qml \
+    GestureView.qml \
+    icon.png
+
+!isEmpty(EXAMPLES_PREFIX) {
+    app.path = $$EXAMPLES_PREFIX/com.nokia.mt.qmlsensorgestures
+    INSTALLS = app
+}
+
diff --git a/examples/sensors/qmlsensorgestures/qml_app/qml_app.qmlproject b/examples/sensors/qmlsensorgestures/qml_app/qml_app.qmlproject
deleted file mode 100644
index 90245a6..0000000
--- a/examples/sensors/qmlsensorgestures/qml_app/qml_app.qmlproject
+++ /dev/null
@@ -1,18 +0,0 @@
-import QmlProject 1.1
-
-Project {
-    mainFile: "Gesture.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ "../exampleplugin" ]
-}
diff --git a/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro b/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro
index 46b8228..01677c1 100644
--- a/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro
+++ b/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 
 SUBDIRS += plugin
-SUBDIRS += #qml_app
+SUBDIRS += qml_app
 
diff --git a/examples/sensors/sensor_explorer/import/import.pro b/examples/sensors/sensor_explorer/import/import.pro
index 7baec42..ec78653 100644
--- a/examples/sensors/sensor_explorer/import/import.pro
+++ b/examples/sensors/sensor_explorer/import/import.pro
@@ -1,19 +1,15 @@
-TARGET  = declarative_explorer
-TARGETPATH = Explorer
+TEMPLATE = lib
+CONFIG += plugin
 
-include(qsensorsimport.pri)
+TARGET = $$qtLibraryTarget(declarative_explorer)
+TARGETPATH = Explorer
 
 QT += declarative sensors
 
 SOURCES = main.cpp explorer.cpp sensoritem.cpp propertyinfo.cpp
 HEADERS = explorer.h sensoritem.h propertyinfo.h
 
-symbian {
-    TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = ALL -TCB
-}
-
-!isEmpty(EXAMPLES_PREFIX):DESTPATH=$$EXAMPLES_PREFIX/sensor_explorer/imports/Explorer
+!isEmpty(EXAMPLES_PREFIX):DESTPATH=$$EXAMPLES_PREFIX/com.nokia.mt.sensor_explorer/imports/Explorer
 else:DESTPATH=$$[QT_INSTALL_IMPORTS]/Explorer
 
 target.path=$$DESTPATH
diff --git a/examples/sensors/sensor_explorer/import/qsensorsimport.pri b/examples/sensors/sensor_explorer/import/qsensorsimport.pri
deleted file mode 100644
index b8af2b7..0000000
--- a/examples/sensors/sensor_explorer/import/qsensorsimport.pri
+++ /dev/null
@@ -1,27 +0,0 @@
-load(qt_module)
-
-symbian:load(qt_plugin)
-TEMPLATE = lib
-CONFIG += qt plugin
-
-win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
-
-isEmpty(TARGETPATH) {
-    error("qimportbase.pri: You must provide a TARGETPATH!")
-}
-isEmpty(TARGET) {
-    error("qimportbase.pri: You must provide a TARGET!")
-}
-
-TARGET = $$qtLibraryTarget($$TARGET)
-contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-
-load(qt_targets)
-
-wince*:LIBS += $$QMAKE_LIBS_GUI
-
-symbian: {
-    TARGET.EPOCALLOWDLLDATA=1
-    TARGET.CAPABILITY = All -Tcb
-    load(armcc_warnings)
-}
diff --git a/examples/sensors/sensor_explorer/notions.json b/examples/sensors/sensor_explorer/notions.json
deleted file mode 100644
index 95d0519..0000000
--- a/examples/sensors/sensor_explorer/notions.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "notion-file-version": 1,
-   "capabilities": [
-   ]
-}
diff --git a/examples/sensors/sensor_explorer/PropertyList.qml b/examples/sensors/sensor_explorer/qml_app/PropertyList.qml
index ba956fb..ba956fb 100644
--- a/examples/sensors/sensor_explorer/PropertyList.qml
+++ b/examples/sensors/sensor_explorer/qml_app/PropertyList.qml
diff --git a/examples/sensors/sensor_explorer/SensorList.qml b/examples/sensors/sensor_explorer/qml_app/SensorList.qml
index f95572b..f95572b 100644
--- a/examples/sensors/sensor_explorer/SensorList.qml
+++ b/examples/sensors/sensor_explorer/qml_app/SensorList.qml
diff --git a/examples/sensors/sensor_explorer/components/ApplicationWindow.qml b/examples/sensors/sensor_explorer/qml_app/components/ApplicationWindow.qml
index cab5e94..cab5e94 100644
--- a/examples/sensors/sensor_explorer/components/ApplicationWindow.qml
+++ b/examples/sensors/sensor_explorer/qml_app/components/ApplicationWindow.qml
diff --git a/examples/sensors/sensor_explorer/components/Button.qml b/examples/sensors/sensor_explorer/qml_app/components/Button.qml
index 537a8bc..537a8bc 100644
--- a/examples/sensors/sensor_explorer/components/Button.qml
+++ b/examples/sensors/sensor_explorer/qml_app/components/Button.qml
diff --git a/examples/sensors/sensor_explorer/components/TextField.qml b/examples/sensors/sensor_explorer/qml_app/components/TextField.qml
index c1feaf2..c1feaf2 100644
--- a/examples/sensors/sensor_explorer/components/TextField.qml
+++ b/examples/sensors/sensor_explorer/qml_app/components/TextField.qml
diff --git a/examples/sensors/sensor_explorer/components/images/button_background_disabled.png b/examples/sensors/sensor_explorer/qml_app/components/images/button_background_disabled.png
index 62a00b9..62a00b9 100644
--- a/examples/sensors/sensor_explorer/components/images/button_background_disabled.png
+++ b/examples/sensors/sensor_explorer/qml_app/components/images/button_background_disabled.png
diff --git a/examples/sensors/sensor_explorer/components/images/button_background_normal.png b/examples/sensors/sensor_explorer/qml_app/components/images/button_background_normal.png
index 1fecad5..1fecad5 100644
--- a/examples/sensors/sensor_explorer/components/images/button_background_normal.png
+++ b/examples/sensors/sensor_explorer/qml_app/components/images/button_background_normal.png
diff --git a/examples/sensors/sensor_explorer/components/images/button_background_pressed.png b/examples/sensors/sensor_explorer/qml_app/components/images/button_background_pressed.png
index 149529e..149529e 100644
--- a/examples/sensors/sensor_explorer/components/images/button_background_pressed.png
+++ b/examples/sensors/sensor_explorer/qml_app/components/images/button_background_pressed.png
diff --git a/examples/sensors/sensor_explorer/components/images/textfield_background_disabled.png b/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_disabled.png
index 98bc601..98bc601 100644
--- a/examples/sensors/sensor_explorer/components/images/textfield_background_disabled.png
+++ b/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_disabled.png
diff --git a/examples/sensors/sensor_explorer/components/images/textfield_background_normal.png b/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_normal.png
index b90b50c..b90b50c 100644
--- a/examples/sensors/sensor_explorer/components/images/textfield_background_normal.png
+++ b/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_normal.png
diff --git a/examples/sensors/sensor_explorer/icon.png b/examples/sensors/sensor_explorer/qml_app/icon.png
index c48b609..c48b609 100755..100644
--- a/examples/sensors/sensor_explorer/icon.png
+++ b/examples/sensors/sensor_explorer/qml_app/icon.png
diff --git a/examples/sensors/sensor_explorer/images/listitem_select.png b/examples/sensors/sensor_explorer/qml_app/images/listitem_select.png
index def234f..def234f 100644
--- a/examples/sensors/sensor_explorer/images/listitem_select.png
+++ b/examples/sensors/sensor_explorer/qml_app/images/listitem_select.png
diff --git a/examples/sensors/sensor_explorer/info.json b/examples/sensors/sensor_explorer/qml_app/info.json
index 95b56fe..ce7e0c3 100644
--- a/examples/sensors/sensor_explorer/info.json
+++ b/examples/sensors/sensor_explorer/qml_app/info.json
@@ -7,7 +7,7 @@
         "Subcategory": "utility",
         "MainQML": "main.qml",
         "Version": "1.0.0",
-        "Identifier": "com.nokia.mt.sensorexplorer",
+        "Identifier": "com.nokia.mt.sensor_explorer",
         "Summary": "QML Sensors Explorer demo",
         "Author": "Qt"
     }
diff --git a/examples/sensors/sensor_explorer/main.qml b/examples/sensors/sensor_explorer/qml_app/main.qml
index 8864160..8864160 100644
--- a/examples/sensors/sensor_explorer/main.qml
+++ b/examples/sensors/sensor_explorer/qml_app/main.qml
diff --git a/examples/sensors/sensor_explorer/qml.pro b/examples/sensors/sensor_explorer/qml_app/qml_app.pro
index 71022cd..2eb78ce 100644
--- a/examples/sensors/sensor_explorer/qml.pro
+++ b/examples/sensors/sensor_explorer/qml_app/qml_app.pro
@@ -1,19 +1,16 @@
 TEMPLATE = aux
 
 app.files = \
-    info.json \
-    notions.json \
-    settings.json \
-    main.qml \
     PropertyList.qml \
+    components \
+    images \
+    info.json \
     SensorList.qml \
     icon.png \
-    components \
-    images
+    main.qml
 
 !isEmpty(EXAMPLES_PREFIX) {
-    TARGET_DIR = $$EXAMPLES_PREFIX/com.nokia.mt.sensorexplorer
-    app.path = $$TARGET_DIR
+    app.path = $$EXAMPLES_PREFIX/com.nokia.mt.sensor_explorer
     INSTALLS = app
 }
 
diff --git a/examples/sensors/sensor_explorer/sensor_explorer.pro b/examples/sensors/sensor_explorer/sensor_explorer.pro
index 85ba45e..759e930 100644
--- a/examples/sensors/sensor_explorer/sensor_explorer.pro
+++ b/examples/sensors/sensor_explorer/sensor_explorer.pro
@@ -1,6 +1,5 @@
 TEMPLATE = subdirs
-CONFIG += ordered
 
 SUBDIRS = \
     import \
-    qml.pro
+    qml_app
diff --git a/examples/sensors/sensor_explorer/settings.json b/examples/sensors/sensor_explorer/settings.json
deleted file mode 100644
index a7db387..0000000
--- a/examples/sensors/sensor_explorer/settings.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "version": "1.0.0",
-  "identifier": "com.nokia.mt.sensorexplorer",
-  "label": "QML Sensor Explorer demo",
-  "settings": [
-  ]
-}
diff --git a/examples/sensors/sensorgestures/sensorgestures.pro b/examples/sensors/sensorgestures/sensorgestures.pro
index 82306a9..295db94 100644
--- a/examples/sensors/sensorgestures/sensorgestures.pro
+++ b/examples/sensors/sensorgestures/sensorgestures.pro
@@ -1,13 +1,6 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2011-08-10T11:04:07
-#
-#-------------------------------------------------
-
-QT       += core gui sensors widgets
-
-TARGET = gesture
 TEMPLATE = app
+TARGET = gesture
+QT       += core gui sensors widgets
 
 SOURCES += main.cpp\
         mainwindow.cpp
@@ -16,6 +9,5 @@ HEADERS  += mainwindow.h
 
 FORMS    += mainwindow.ui
 
-
 OTHER_FILES += \
     gesture.png
diff --git a/examples/sensors/sensors.pro b/examples/sensors/sensors.pro
index 8f1d41b..807203f 100644
--- a/examples/sensors/sensors.pro
+++ b/examples/sensors/sensors.pro
@@ -2,13 +2,15 @@ TEMPLATE = subdirs
 
 SUBDIRS += \
     accel \
+    accelbubble \
+    cubehouse \
     grue \
-    qmlsensorgestures \
-    sensor_explorer \
     maze \
     qmlqtsensors \
+    qmlsensorgestures \
+    sensor_explorer \
     shakeit
 
-!isEmpty(QT.widgets.name): SUBDIRS += \
+!isEmpty(QT.widgets.name):SUBDIRS += \
     sensorgestures
 
diff --git a/examples/sensors/shakeit/audio/loopy2a_mono.wav b/examples/sensors/shakeit/audio/loopy2a_mono.wav
index 7d76cb6..7d76cb6 100755..100644
--- a/examples/sensors/shakeit/audio/loopy2a_mono.wav
+++ b/examples/sensors/shakeit/audio/loopy2a_mono.wav
diff --git a/examples/sensors/shakeit/notions.json b/examples/sensors/shakeit/notions.json
deleted file mode 100644
index 95d0519..0000000
--- a/examples/sensors/shakeit/notions.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "notion-file-version": 1,
-   "capabilities": [
-   ]
-}
diff --git a/examples/sensors/shakeit/qml.pro b/examples/sensors/shakeit/qml.pro
deleted file mode 100644
index 30348d1..0000000
--- a/examples/sensors/shakeit/qml.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-TEMPLATE = aux
-
-app.files = \
-    info.json \
-    notions.json \
-    settings.json \
-    shakeit.qml \
-    icon.png \
-    audio \
-    images
-
-!isEmpty(EXAMPLES_PREFIX) {
-    TARGET_DIR = $$EXAMPLES_PREFIX/com.nokia.mt.shakeit
-    app.path = $$TARGET_DIR
-    INSTALLS = app
-}
-
diff --git a/examples/sensors/shakeit/settings.json b/examples/sensors/shakeit/settings.json
deleted file mode 100644
index 31fc2fb..0000000
--- a/examples/sensors/shakeit/settings.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "version": "1.0.0",
-  "identifier": "com.nokia.mt.shakeit",
-  "label": "ShakeIt demonstrates the Qt5 QtSensor Gestures API",
-  "settings": [
-  ]
-}
diff --git a/examples/sensors/shakeit/shakeit.pro b/examples/sensors/shakeit/shakeit.pro
index 6dc685b..65660e3 100644
--- a/examples/sensors/shakeit/shakeit.pro
+++ b/examples/sensors/shakeit/shakeit.pro
@@ -1,3 +1,14 @@
-TEMPLATE = subdirs
+TEMPLATE = aux
+
+app.files = \
+    info.json \
+    shakeit.qml \
+    icon.png \
+    audio \
+    images
+
+!isEmpty(EXAMPLES_PREFIX) {
+    app.path = $$EXAMPLES_PREFIX/com.nokia.mt.shakeit
+    INSTALLS = app
+}
 
-SUBDIRS = qml.pro