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/accelbubble/accelbubble.pro        |  13 +++++++++++++
 examples/sensors/accelbubble/accelbubble.qmlproject |  18 ------------------
 examples/sensors/accelbubble/icon.png               | Bin 3706 -> 2034 bytes
 examples/sensors/accelbubble/info.json              |   2 +-
 4 files changed, 14 insertions(+), 19 deletions(-)
 create mode 100644 examples/sensors/accelbubble/accelbubble.pro
 delete mode 100644 examples/sensors/accelbubble/accelbubble.qmlproject

(limited to 'examples/sensors/accelbubble')

diff --git a/examples/sensors/accelbubble/accelbubble.pro b/examples/sensors/accelbubble/accelbubble.pro
new file mode 100644
index 00000000..8d7e1769
--- /dev/null
+++ b/examples/sensors/accelbubble/accelbubble.pro
@@ -0,0 +1,13 @@
+TEMPLATE = aux
+
+app.files = \
+    info.json \
+    main.qml \
+    icon.png \
+    images
+
+!isEmpty(EXAMPLES_PREFIX) {
+    app.path = $$EXAMPLES_PREFIX/com.nokia.mt.accelbubble
+    INSTALLS = app
+}
+
diff --git a/examples/sensors/accelbubble/accelbubble.qmlproject b/examples/sensors/accelbubble/accelbubble.qmlproject
deleted file mode 100644
index 4d32f758..00000000
--- a/examples/sensors/accelbubble/accelbubble.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: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ "../exampleplugin" ]
-}
diff --git a/examples/sensors/accelbubble/icon.png b/examples/sensors/accelbubble/icon.png
index 9127d43a..d74f1111 100644
Binary files a/examples/sensors/accelbubble/icon.png and b/examples/sensors/accelbubble/icon.png differ
diff --git a/examples/sensors/accelbubble/info.json b/examples/sensors/accelbubble/info.json
index 36799885..9a2ed709 100644
--- a/examples/sensors/accelbubble/info.json
+++ b/examples/sensors/accelbubble/info.json
@@ -7,7 +7,7 @@
         "Subcategory": "utility",
         "MainQML": "main.qml",
         "Version": "1.0",
-        "Identifier": "com.nokia.mt.accelbubble.demo",
+        "Identifier": "com.nokia.mt.accelbubble",
         "Summary": "QtSensors Accel Bubble",
         "Author": "Qt"
     }
-- 
cgit v1.2.3