diff options
author | Wolfgang Beck <wolfgang.beck@nokia.com> | 2012-02-03 14:31:49 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-14 03:52:38 +0100 |
commit | 8d2a6e427067027769e1f3c6322ae06620146396 (patch) | |
tree | 1c60262b79fc0b5b4bf70ddce7085cb18c99c5db /examples/sensors/sensor_explorer | |
parent | a1ecc85fa88fdd318b379e35139c5d6486c78bd8 (diff) |
Update Examples for SDK team
Change-Id: Ib81ebf326a1ee4330a268c8d57934e3d77ea68bb
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'examples/sensors/sensor_explorer')
-rw-r--r-- | examples/sensors/sensor_explorer/PropertyList.qml (renamed from examples/sensors/sensor_explorer/qml_app/PropertyList.qml) | 0 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/SensorList.qml (renamed from examples/sensors/sensor_explorer/qml_app/SensorList.qml) | 0 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/components/ApplicationWindow.qml (renamed from examples/sensors/sensor_explorer/qml_app/components/ApplicationWindow.qml) | 0 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/components/Button.qml (renamed from examples/sensors/sensor_explorer/qml_app/components/Button.qml) | 0 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/components/TextField.qml (renamed from examples/sensors/sensor_explorer/qml_app/components/TextField.qml) | 0 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/components/images/button_background_disabled.png (renamed from examples/sensors/sensor_explorer/qml_app/components/images/button_background_disabled.png) | bin | 579 -> 579 bytes | |||
-rw-r--r-- | examples/sensors/sensor_explorer/components/images/button_background_normal.png (renamed from examples/sensors/sensor_explorer/qml_app/components/images/button_background_normal.png) | bin | 901 -> 901 bytes | |||
-rw-r--r-- | examples/sensors/sensor_explorer/components/images/button_background_pressed.png (renamed from examples/sensors/sensor_explorer/qml_app/components/images/button_background_pressed.png) | bin | 334 -> 334 bytes | |||
-rw-r--r-- | examples/sensors/sensor_explorer/components/images/textfield_background_disabled.png (renamed from examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_disabled.png) | bin | 936 -> 936 bytes | |||
-rw-r--r-- | examples/sensors/sensor_explorer/components/images/textfield_background_normal.png (renamed from examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_normal.png) | bin | 767 -> 767 bytes | |||
-rwxr-xr-x | examples/sensors/sensor_explorer/icon.png (renamed from examples/sensors/sensor_explorer/qml_app/icon.png) | bin | 2205 -> 2205 bytes | |||
-rw-r--r-- | examples/sensors/sensor_explorer/images/listitem_select.png (renamed from examples/sensors/sensor_explorer/qml_app/images/listitem_select.png) | bin | 156 -> 156 bytes | |||
-rw-r--r-- | examples/sensors/sensor_explorer/info.json (renamed from examples/sensors/sensor_explorer/qml_app/info.json) | 8 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/main.qml (renamed from examples/sensors/sensor_explorer/qml_app/main.qml) | 0 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/notions.json | 5 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/qml.pro | 19 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/qml_app/qml_app.qmlproject | 18 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/sensor_explorer.pro | 6 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/sensor_explorer.qdoc | 95 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/settings.json | 7 |
20 files changed, 39 insertions, 119 deletions
diff --git a/examples/sensors/sensor_explorer/qml_app/PropertyList.qml b/examples/sensors/sensor_explorer/PropertyList.qml index ba956fba..ba956fba 100644 --- a/examples/sensors/sensor_explorer/qml_app/PropertyList.qml +++ b/examples/sensors/sensor_explorer/PropertyList.qml diff --git a/examples/sensors/sensor_explorer/qml_app/SensorList.qml b/examples/sensors/sensor_explorer/SensorList.qml index f95572b3..f95572b3 100644 --- a/examples/sensors/sensor_explorer/qml_app/SensorList.qml +++ b/examples/sensors/sensor_explorer/SensorList.qml diff --git a/examples/sensors/sensor_explorer/qml_app/components/ApplicationWindow.qml b/examples/sensors/sensor_explorer/components/ApplicationWindow.qml index cab5e94c..cab5e94c 100644 --- a/examples/sensors/sensor_explorer/qml_app/components/ApplicationWindow.qml +++ b/examples/sensors/sensor_explorer/components/ApplicationWindow.qml diff --git a/examples/sensors/sensor_explorer/qml_app/components/Button.qml b/examples/sensors/sensor_explorer/components/Button.qml index 537a8bce..537a8bce 100644 --- a/examples/sensors/sensor_explorer/qml_app/components/Button.qml +++ b/examples/sensors/sensor_explorer/components/Button.qml diff --git a/examples/sensors/sensor_explorer/qml_app/components/TextField.qml b/examples/sensors/sensor_explorer/components/TextField.qml index c1feaf21..c1feaf21 100644 --- a/examples/sensors/sensor_explorer/qml_app/components/TextField.qml +++ b/examples/sensors/sensor_explorer/components/TextField.qml diff --git a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_disabled.png b/examples/sensors/sensor_explorer/components/images/button_background_disabled.png Binary files differindex 62a00b9a..62a00b9a 100644 --- a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_disabled.png +++ b/examples/sensors/sensor_explorer/components/images/button_background_disabled.png diff --git a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_normal.png b/examples/sensors/sensor_explorer/components/images/button_background_normal.png Binary files differindex 1fecad5b..1fecad5b 100644 --- a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_normal.png +++ b/examples/sensors/sensor_explorer/components/images/button_background_normal.png diff --git a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_pressed.png b/examples/sensors/sensor_explorer/components/images/button_background_pressed.png Binary files differindex 149529e1..149529e1 100644 --- a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_pressed.png +++ b/examples/sensors/sensor_explorer/components/images/button_background_pressed.png diff --git a/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_disabled.png b/examples/sensors/sensor_explorer/components/images/textfield_background_disabled.png Binary files differindex 98bc601f..98bc601f 100644 --- a/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_disabled.png +++ b/examples/sensors/sensor_explorer/components/images/textfield_background_disabled.png diff --git a/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_normal.png b/examples/sensors/sensor_explorer/components/images/textfield_background_normal.png Binary files differindex b90b50cd..b90b50cd 100644 --- a/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_normal.png +++ b/examples/sensors/sensor_explorer/components/images/textfield_background_normal.png diff --git a/examples/sensors/sensor_explorer/qml_app/icon.png b/examples/sensors/sensor_explorer/icon.png Binary files differindex c48b6095..c48b6095 100755 --- a/examples/sensors/sensor_explorer/qml_app/icon.png +++ b/examples/sensors/sensor_explorer/icon.png diff --git a/examples/sensors/sensor_explorer/qml_app/images/listitem_select.png b/examples/sensors/sensor_explorer/images/listitem_select.png Binary files differindex def234f1..def234f1 100644 --- a/examples/sensors/sensor_explorer/qml_app/images/listitem_select.png +++ b/examples/sensors/sensor_explorer/images/listitem_select.png diff --git a/examples/sensors/sensor_explorer/qml_app/info.json b/examples/sensors/sensor_explorer/info.json index 3f1feb43..95b56fe5 100644 --- a/examples/sensors/sensor_explorer/qml_app/info.json +++ b/examples/sensors/sensor_explorer/info.json @@ -3,12 +3,12 @@ "dict": { "Category": "application", "Runtime": "qml", - "DisplayName": "Sensor Explorer", + "DisplayName": "Sensors Explorer", "Subcategory": "utility", "MainQML": "main.qml", - "Version": "1.0", - "Identifier": "com.nokia.mt.sensorexplorer.demo", - "Summary": "QML Sensor Explorer demo", + "Version": "1.0.0", + "Identifier": "com.nokia.mt.sensorexplorer", + "Summary": "QML Sensors Explorer demo", "Author": "Qt" } } diff --git a/examples/sensors/sensor_explorer/qml_app/main.qml b/examples/sensors/sensor_explorer/main.qml index 88641604..88641604 100644 --- a/examples/sensors/sensor_explorer/qml_app/main.qml +++ b/examples/sensors/sensor_explorer/main.qml diff --git a/examples/sensors/sensor_explorer/notions.json b/examples/sensors/sensor_explorer/notions.json new file mode 100644 index 00000000..95d05191 --- /dev/null +++ b/examples/sensors/sensor_explorer/notions.json @@ -0,0 +1,5 @@ +{ + "notion-file-version": 1, + "capabilities": [ + ] +} diff --git a/examples/sensors/sensor_explorer/qml.pro b/examples/sensors/sensor_explorer/qml.pro new file mode 100644 index 00000000..71022cd5 --- /dev/null +++ b/examples/sensors/sensor_explorer/qml.pro @@ -0,0 +1,19 @@ +TEMPLATE = aux + +app.files = \ + info.json \ + notions.json \ + settings.json \ + main.qml \ + PropertyList.qml \ + SensorList.qml \ + icon.png \ + components \ + images + +!isEmpty(EXAMPLES_PREFIX) { + TARGET_DIR = $$EXAMPLES_PREFIX/com.nokia.mt.sensorexplorer + app.path = $$TARGET_DIR + INSTALLS = app +} + diff --git a/examples/sensors/sensor_explorer/qml_app/qml_app.qmlproject b/examples/sensors/sensor_explorer/qml_app/qml_app.qmlproject deleted file mode 100644 index 51457fa6..00000000 --- a/examples/sensors/sensor_explorer/qml_app/qml_app.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/sensor_explorer/sensor_explorer.pro b/examples/sensors/sensor_explorer/sensor_explorer.pro index caa66808..85ba45ef 100644 --- a/examples/sensors/sensor_explorer/sensor_explorer.pro +++ b/examples/sensors/sensor_explorer/sensor_explorer.pro @@ -1,4 +1,6 @@ TEMPLATE = subdirs +CONFIG += ordered -SUBDIRS += import #qml_app - +SUBDIRS = \ + import \ + qml.pro diff --git a/examples/sensors/sensor_explorer/sensor_explorer.qdoc b/examples/sensors/sensor_explorer/sensor_explorer.qdoc deleted file mode 100644 index 003429f7..00000000 --- a/examples/sensors/sensor_explorer/sensor_explorer.qdoc +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 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$ -** -****************************************************************************/ - -/*! - \page sensor_explorer.html - \title Sensor Explorer example - \ingroup qtsensors-examples - \brief The Sensor Explorer example demonstrates how to read the meta-data of available sensors. - \image sensorexplorer.jpg - -\section1 Overview - This example contains 2 projects. - - A \l{Sensor Explorer QML Import} to make the sensors and their meta-data available to a QML application. - - A \l{Sensor Explorer QML Application} that represents the \l{Sensor Explorer QML Import} information to the user interface. -*/ - - -/*! - \example sensors/sensor_explorer/import - \title Sensor Explorer QML Import - \brief The Sensor Explorer QML import exports the QSensorExplorer, QPropertyInfo and the QSensorItem class as a QML element. - - This example creates the \e {Explorer 1.0} import. - - \sa {Sensor Explorer Example} -*/ - -/*! - \example sensors/sensor_explorer/qml_app - \title Sensor Explorer QML Application - \brief The Sensor Explorer QML application demonstrates use of the Explorer 1.0 import QML elements. - - This is a pure QML application that can be run from Qt Creator or directly using the - \c qmlscene binary. You should install the other projects before trying to run - this example or it will not be able to find its dependencies. - - \code - qmlscene main.qml - \endcode - - \sa {Sensor Explorer Example} - -\section1 Overview - To write a QML application that will use the Explorer QML element you need to do the following steps: - - Import the Explorer 1.0 declarative plugin: - - \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 0 - - Create a SensorExplorer QML item: - - \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 1 - - You can retrieve a list of all available sensors using the SensorExplorer: - - \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 2 - - To retrieve the properties of a SensorItem use: - - \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 3 - - Changing a property value can be done like: - - \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 4 - - Starting and stoping a sesnor can be done like: - - \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 5 -*/ diff --git a/examples/sensors/sensor_explorer/settings.json b/examples/sensors/sensor_explorer/settings.json new file mode 100644 index 00000000..a7db3876 --- /dev/null +++ b/examples/sensors/sensor_explorer/settings.json @@ -0,0 +1,7 @@ +{ + "version": "1.0.0", + "identifier": "com.nokia.mt.sensorexplorer", + "label": "QML Sensor Explorer demo", + "settings": [ + ] +} |