From 527740c721ee37472146a7302eae3ece58779e93 Mon Sep 17 00:00:00 2001
From: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Date: Fri, 24 Feb 2012 13:27:57 +1000
Subject: 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>
---
 examples/sensors/qmlsensorgestures/plugin/plugin.pro  |   9 ---------
 examples/sensors/qmlsensorgestures/qml_app/icon.png   | Bin
 examples/sensors/qmlsensorgestures/qml_app/info.json  |   2 +-
 .../sensors/qmlsensorgestures/qml_app/qml_app.pro     |  16 ++++++++++++++++
 .../qmlsensorgestures/qml_app/qml_app.qmlproject      |  18 ------------------
 .../sensors/qmlsensorgestures/qmlsensorgestures.pro   |   2 +-
 6 files changed, 18 insertions(+), 29 deletions(-)
 mode change 100755 => 100644 examples/sensors/qmlsensorgestures/qml_app/icon.png
 create mode 100644 examples/sensors/qmlsensorgestures/qml_app/qml_app.pro
 delete mode 100644 examples/sensors/qmlsensorgestures/qml_app/qml_app.qmlproject

(limited to 'examples/sensors/qmlsensorgestures')

diff --git a/examples/sensors/qmlsensorgestures/plugin/plugin.pro b/examples/sensors/qmlsensorgestures/plugin/plugin.pro
index ab250884..0e9cb1aa 100644
--- a/examples/sensors/qmlsensorgestures/plugin/plugin.pro
+++ b/examples/sensors/qmlsensorgestures/plugin/plugin.pro
@@ -6,7 +6,6 @@ TARGET = qtsensorgestures_counterplugin
 QT += sensors
 DESTDIR = $$QT.sensors.plugins/sensorgestures
 
-# Input
 HEADERS += \
     qcountergestureplugin.h \
     qcounterrecognizer.h
@@ -17,11 +16,3 @@ SOURCES += \
 target.path += $$[QT_INSTALL_PLUGINS]/sensorgestures
 INSTALLS += target
 
-
-
-
-
-
-
-
-
diff --git a/examples/sensors/qmlsensorgestures/qml_app/icon.png b/examples/sensors/qmlsensorgestures/qml_app/icon.png
old mode 100755
new mode 100644
diff --git a/examples/sensors/qmlsensorgestures/qml_app/info.json b/examples/sensors/qmlsensorgestures/qml_app/info.json
index 39a62190..063caaa0 100644
--- a/examples/sensors/qmlsensorgestures/qml_app/info.json
+++ b/examples/sensors/qmlsensorgestures/qml_app/info.json
@@ -7,7 +7,7 @@
       "Subcategory": "utility",
       "MainQML": "Gesture.qml",
       "Version": "1.0",
-      "Identifier": "com.nokia.mt.qmlsensorsgesture.demo",
+      "Identifier": "com.nokia.mt.qmlsensorsgesture",
       "Summary": "QML Sensors Gesture demo",
       "Author": "Qt"
   }
diff --git a/examples/sensors/qmlsensorgestures/qml_app/qml_app.pro b/examples/sensors/qmlsensorgestures/qml_app/qml_app.pro
new file mode 100644
index 00000000..f7741f46
--- /dev/null
+++ b/examples/sensors/qmlsensorgestures/qml_app/qml_app.pro
@@ -0,0 +1,16 @@
+TEMPLATE = aux
+
+app.files = \
+    Button.qml \
+    GestureList.qml \
+    GesturesView.qml \
+    info.json \
+    Gesture.qml \
+    GestureView.qml \
+    icon.png
+
+!isEmpty(EXAMPLES_PREFIX) {
+    app.path = $$EXAMPLES_PREFIX/com.nokia.mt.qmlsensorgestures
+    INSTALLS = app
+}
+
diff --git a/examples/sensors/qmlsensorgestures/qml_app/qml_app.qmlproject b/examples/sensors/qmlsensorgestures/qml_app/qml_app.qmlproject
deleted file mode 100644
index 90245a62..00000000
--- a/examples/sensors/qmlsensorgestures/qml_app/qml_app.qmlproject
+++ /dev/null
@@ -1,18 +0,0 @@
-import QmlProject 1.1
-
-Project {
-    mainFile: "Gesture.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" ]
-}
diff --git a/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro b/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro
index 46b8228d..01677c19 100644
--- a/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro
+++ b/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 
 SUBDIRS += plugin
-SUBDIRS += #qml_app
+SUBDIRS += qml_app
 
-- 
cgit v1.2.3