20 files changed, 12 insertions, 59 deletions
diff --git a/examples/sensors/sensor_explorer/import/import.pro b/examples/sensors/sensor_explorer/import/import.pro
index 7baec429..ec78653e 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 b8af2b7b..00000000
--- 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 95d05191..00000000
--- 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 ba956fba..ba956fba 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 f95572b3..f95572b3 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 cab5e94c..cab5e94c 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 537a8bce..537a8bce 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 c1feaf21..c1feaf21 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 62a00b9a..62a00b9a 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 1fecad5b..1fecad5b 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 149529e1..149529e1 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 98bc601f..98bc601f 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 b90b50cd..b90b50cd 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 c48b6095..c48b6095 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 def234f1..def234f1 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 95b56fe5..ce7e0c37 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 88641604..88641604 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 71022cd5..2eb78cea 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 85ba45ef..759e9307 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 a7db3876..00000000
--- 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": [
-  ]
-}