Update Examples for SDK team

Change-Id: Ib81ebf326a1ee4330a268c8d57934e3d77ea68bb
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>

7 files changed, 36 insertions, 90 deletions

diff --git a/examples/sensors/qmlqtsensors/info.json b/examples/sensors/qmlqtsensors/info.json
index 797dd6f0..d76c3002 100644
--- a/examples/sensors/qmlqtsensors/info.json
+++ b/examples/sensors/qmlqtsensors/info.json
@@ -3,12 +3,12 @@
     "dict": {
         "Category": "application",
         "Runtime": "qml",
-        "DisplayName": "QtSensors",
+        "DisplayName": "QML QtSensors",
         "Subcategory": "utility",
         "MainQML": "main.qml",
-        "Version": "1.0",
-        "Identifier": "com.nokia.mt.qmlqtsensors.demo",
-        "Summary": "QML QtSensors demo",
+        "Version": "1.0.0",
+        "Identifier": "com.nokia.mt.qmlqtsensors",
+        "Summary": "QML Qt Sensors demo",
         "Author": "Qt"
     }
 }
diff --git a/examples/sensors/qmlqtsensors/notions.json b/examples/sensors/qmlqtsensors/notions.json
new file mode 100644
index 00000000..95d05191
--- /dev/null
+++ b/examples/sensors/qmlqtsensors/notions.json
@@ -0,0 +1,5 @@
+{
+   "notion-file-version": 1,
+   "capabilities": [
+   ]
+}
diff --git a/examples/sensors/qmlqtsensors/qml.pro b/examples/sensors/qmlqtsensors/qml.pro
new file mode 100644
index 00000000..6838887e
--- /dev/null
+++ b/examples/sensors/qmlqtsensors/qml.pro
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 00000000..a15e39ef
--- /dev/null
+++ b/examples/sensors/qmlqtsensors/qmlqtsensors.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+SUBDIRS = qml.pro
+
diff --git a/examples/sensors/qmlqtsensors/qmlqtsensors.qdoc b/examples/sensors/qmlqtsensors/qmlqtsensors.qdoc
deleted file mode 100644
index 4e997c8a..00000000
--- a/examples/sensors/qmlqtsensors/qmlqtsensors.qdoc
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** GNU Free Documentation License
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms
-** and conditions contained in a signed written agreement between you
-** and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \example sensors/qmlqtsensors
-    \title QML QtSensors example
-    \ingroup qtsensors-examples
-    \brief The QML QtSensors example demonstrates the QML sensors elements in the QtSensors 5 import.
-    \image qmlqtsensors.jpg
-
-\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
-
-    Add the Sensor QML elements into your qml file.
-
-    In this example we use the TiltSensor:
-
-\snippet ../examples/sensors/qmlqtsensors/main.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
-
-    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
-
-    \l {QtSensors5::AmbientLightSensor} {AmbientLightSensor}
-
-\snippet ../examples/sensors/qmlqtsensors/main.qml 5
-
-    \l {QtSensors5::ProximitySensor} {ProximitySensor}
-
-\snippet ../examples/sensors/qmlqtsensors/main.qml 6
-*/
-
diff --git a/examples/sensors/qmlqtsensors/qmlqtsensors.qmlproject b/examples/sensors/qmlqtsensors/qmlqtsensors.qmlproject
deleted file mode 100644
index 51457fa6..00000000
--- a/examples/sensors/qmlqtsensors/qmlqtsensors.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: "./images"
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ "../exampleplugin" ]
-}
diff --git a/examples/sensors/qmlqtsensors/settings.json b/examples/sensors/qmlqtsensors/settings.json
new file mode 100644
index 00000000..c0d28762
--- /dev/null
+++ b/examples/sensors/qmlqtsensors/settings.json
@@ -0,0 +1,7 @@
+{
+  "version": "1.0.0",
+  "identifier": "com.nokia.mt.qmlqtsensors",
+  "label": "QML Qt Sensors demo",
+  "settings": [
+  ]
+}