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>

8 files changed, 28 insertions, 77 deletions

diff --git a/examples/sensors/grue/grue.pro b/examples/sensors/grue/grue.pro
index 5af352bc..0405286d 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 0bb108f7..98277ddc 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 b8af2b7b..00000000
--- 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 8ff9b319..7e087baa 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 d325e001..90d7a01a 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 e60fa3c2..2e14fc79 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 00000000..47c6c140
--- /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 2218c43d..00000000
--- 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" ]
-}