summaryrefslogtreecommitdiffstats
path: root/examples/sensors/qmlsensorgestures
diff options
context:
space:
mode:
Diffstat (limited to 'examples/sensors/qmlsensorgestures')
-rw-r--r--examples/sensors/qmlsensorgestures/plugin/plugin.pro9
-rw-r--r--[-rwxr-xr-x]examples/sensors/qmlsensorgestures/qml_app/icon.pngbin2298 -> 2298 bytes
-rw-r--r--examples/sensors/qmlsensorgestures/qml_app/info.json2
-rw-r--r--examples/sensors/qmlsensorgestures/qml_app/qml_app.pro16
-rw-r--r--examples/sensors/qmlsensorgestures/qml_app/qml_app.qmlproject18
-rw-r--r--examples/sensors/qmlsensorgestures/qmlsensorgestures.pro2
6 files changed, 18 insertions, 29 deletions
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
index c445bd7f..c445bd7f 100755..100644
--- a/examples/sensors/qmlsensorgestures/qml_app/icon.png
+++ b/examples/sensors/qmlsensorgestures/qml_app/icon.png
Binary files differ
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