From 6c18ce4048212e92380d2d7e6da9b0b95c30b177 Mon Sep 17 00:00:00 2001 From: Lincoln Ramsay Date: Fri, 1 Jun 2012 15:54:27 +1000 Subject: Install all .qml files. Instead of having a list of .qml files that needs to be kept in sync with the filesystem, pull in all .qml files. 2 examples (cube house, QML sensor gestures) were broken by having the .pro contents failing to match the filesystem. A similar change is made for the one project with .js files. Change-Id: I935a32b78138dfd2698d508a7524035eb5c0c2f9 Reviewed-by: Daron Andrew Edie --- examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.pro | 2 +- examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.pro | 5 +---- examples/QtSensors/QtSensors_grue/qml.pro | 2 +- examples/QtSensors/QtSensors_maze/qml.pro | 7 ++----- examples/QtSensors/QtSensors_qmlqtsensors/qml.pro | 2 +- examples/QtSensors/QtSensors_qmlsensorgestures/qml.pro | 6 +----- examples/QtSensors/QtSensors_sensor_explorer/qml.pro | 4 +--- examples/QtSensors/QtSensors_shakeit/qml.pro | 2 +- 8 files changed, 9 insertions(+), 21 deletions(-) (limited to 'examples') diff --git a/examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.pro b/examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.pro index 46bc335c..25b12aaa 100644 --- a/examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.pro +++ b/examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.pro @@ -2,7 +2,7 @@ TEMPLATE = aux app.files = \ info.json \ - QtSensors_accelbubble.qml \ + $$files(*.qml) \ icon.png \ content \ images diff --git a/examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.pro b/examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.pro index 075ec4ef..995446c0 100644 --- a/examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.pro +++ b/examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.pro @@ -1,10 +1,7 @@ TEMPLATE = aux app.files = \ - Cube.qml \ - Cubehouse.qml \ - Room.qml \ - Table.qml \ + $$files(*.qml) \ icon.png \ images \ info.json \ diff --git a/examples/QtSensors/QtSensors_grue/qml.pro b/examples/QtSensors/QtSensors_grue/qml.pro index c017dcc4..e3d021e0 100644 --- a/examples/QtSensors/QtSensors_grue/qml.pro +++ b/examples/QtSensors/QtSensors_grue/qml.pro @@ -3,7 +3,7 @@ TEMPLATE = aux app.files = \ icon.png \ info.json \ - main.qml \ + $$files(*.qml) \ grue.png MT_SYSROOT=$$(MT_SYSROOT) diff --git a/examples/QtSensors/QtSensors_maze/qml.pro b/examples/QtSensors/QtSensors_maze/qml.pro index 765b9d0d..95fbb65e 100644 --- a/examples/QtSensors/QtSensors_maze/qml.pro +++ b/examples/QtSensors/QtSensors_maze/qml.pro @@ -3,11 +3,8 @@ TEMPLATE = aux app.files = \ components \ info.json \ - Congratulation.qml \ - LabyrinthSquare.qml \ - lib.js \ - QtSensors_maze.qml \ - Mouse.qml \ + $$files(*.qml) \ + $$files(*.js) \ icon.png \ content diff --git a/examples/QtSensors/QtSensors_qmlqtsensors/qml.pro b/examples/QtSensors/QtSensors_qmlqtsensors/qml.pro index e1ec8724..741070ff 100644 --- a/examples/QtSensors/QtSensors_qmlqtsensors/qml.pro +++ b/examples/QtSensors/QtSensors_qmlqtsensors/qml.pro @@ -2,7 +2,7 @@ TEMPLATE = aux app.files = \ info.json \ - QtSensors_qmlqtsensors.qml \ + $$files(*.qml) \ icon.png \ components diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/qml.pro b/examples/QtSensors/QtSensors_qmlsensorgestures/qml.pro index 6ad9a8bf..333f251c 100644 --- a/examples/QtSensors/QtSensors_qmlsensorgestures/qml.pro +++ b/examples/QtSensors/QtSensors_qmlsensorgestures/qml.pro @@ -1,12 +1,8 @@ TEMPLATE = aux app.files = \ - Button.qml \ - GestureList.qml \ - GesturesView.qml \ + $$files(*.qml) \ info.json \ - Gesture.qml \ - GestureView.qml \ icon.png MT_SYSROOT=$$(MT_SYSROOT) diff --git a/examples/QtSensors/QtSensors_sensor_explorer/qml.pro b/examples/QtSensors/QtSensors_sensor_explorer/qml.pro index bc4f8588..fae3705d 100644 --- a/examples/QtSensors/QtSensors_sensor_explorer/qml.pro +++ b/examples/QtSensors/QtSensors_sensor_explorer/qml.pro @@ -2,9 +2,7 @@ TEMPLATE = aux app.files = \ info.json \ - QtSensors_sensor_explorer.qml \ - PropertyList.qml \ - SensorList.qml \ + $$files(*.qml) \ icon.png \ components \ content diff --git a/examples/QtSensors/QtSensors_shakeit/qml.pro b/examples/QtSensors/QtSensors_shakeit/qml.pro index a56249de..1265d8e9 100644 --- a/examples/QtSensors/QtSensors_shakeit/qml.pro +++ b/examples/QtSensors/QtSensors_shakeit/qml.pro @@ -2,7 +2,7 @@ TEMPLATE = aux app.files = \ info.json \ - QtSensors_shakeit.qml \ + $$files(*.qml) \ icon.png \ audio \ content -- cgit v1.2.3