summaryrefslogtreecommitdiffstats
path: root/examples/sensors/qmlqtsensors
diff options
context:
space:
mode:
authorLincoln Ramsay <lincoln.ramsay@nokia.com>2012-02-24 13:27:57 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-27 01:45:33 +0100
commit527740c721ee37472146a7302eae3ece58779e93 (patch)
tree6a80300d4667ce4a68608406f7c3cc75358c1368 /examples/sensors/qmlqtsensors
parent1fccbe513dde883cb310b44bf9ce13bc5df51dfa (diff)
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>
Diffstat (limited to 'examples/sensors/qmlqtsensors')
-rw-r--r--[-rwxr-xr-x]examples/sensors/qmlqtsensors/icon.pngbin2122 -> 2122 bytes
-rw-r--r--examples/sensors/qmlqtsensors/notions.json5
-rw-r--r--examples/sensors/qmlqtsensors/qml.pro16
-rw-r--r--examples/sensors/qmlqtsensors/qmlqtsensors.pro13
-rw-r--r--examples/sensors/qmlqtsensors/settings.json7
5 files changed, 11 insertions, 30 deletions
diff --git a/examples/sensors/qmlqtsensors/icon.png b/examples/sensors/qmlqtsensors/icon.png
index d3243c5b..d3243c5b 100755..100644
--- a/examples/sensors/qmlqtsensors/icon.png
+++ b/examples/sensors/qmlqtsensors/icon.png
Binary files differ
diff --git a/examples/sensors/qmlqtsensors/notions.json b/examples/sensors/qmlqtsensors/notions.json
deleted file mode 100644
index 95d05191..00000000
--- 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 6838887e..00000000
--- 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 a15e39ef..84f38f64 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 c0d28762..00000000
--- 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": [
- ]
-}