From f89b0fcffbb7907210d4d85d1245dc59f270c251 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 28 Feb 2014 13:54:18 +0100 Subject: Fix the examples so they can be deployed on Android MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8d3b0c84091cf7743164c083318e0a115e948d1c Reviewed-by: Lorn Potter Reviewed-by: Topi Reiniö --- examples/sensors/accelbubble/accelbubble.pro | 8 +++----- examples/sensors/accelbubble/icon.png | Bin 2034 -> 0 bytes examples/sensors/cubehouse/cubehouse.pro | 8 +++----- examples/sensors/cubehouse/icon.png | Bin 7607 -> 0 bytes examples/sensors/grue/icon.png | Bin 7951 -> 0 bytes examples/sensors/grue/qml.pro | 6 ++---- examples/sensors/maze/icon.png | Bin 4693 -> 0 bytes examples/sensors/maze/maze.pro | 8 +++----- examples/sensors/qmlqtsensors/icon.png | Bin 2122 -> 0 bytes examples/sensors/qmlqtsensors/qmlqtsensors.pro | 8 +++----- examples/sensors/qmlsensorgestures/icon.png | Bin 2298 -> 0 bytes examples/sensors/qmlsensorgestures/qml.pro | 10 ++++------ examples/sensors/sensor_explorer/icon.png | Bin 2205 -> 0 bytes examples/sensors/sensor_explorer/qml.pro | 8 +++----- examples/sensors/sensorgestures/gesture.png | Bin 3400 -> 0 bytes examples/sensors/sensorgestures/sensorgestures.pro | 6 ++---- examples/sensors/shakeit/icon.png | Bin 10695 -> 0 bytes examples/sensors/shakeit/shakeit.pro | 6 ++---- 18 files changed, 25 insertions(+), 43 deletions(-) delete mode 100644 examples/sensors/accelbubble/icon.png delete mode 100644 examples/sensors/cubehouse/icon.png delete mode 100644 examples/sensors/grue/icon.png delete mode 100644 examples/sensors/maze/icon.png delete mode 100644 examples/sensors/qmlqtsensors/icon.png delete mode 100644 examples/sensors/qmlsensorgestures/icon.png delete mode 100644 examples/sensors/sensor_explorer/icon.png delete mode 100644 examples/sensors/sensorgestures/gesture.png delete mode 100644 examples/sensors/shakeit/icon.png (limited to 'examples') diff --git a/examples/sensors/accelbubble/accelbubble.pro b/examples/sensors/accelbubble/accelbubble.pro index d0378bb3..b183bf41 100644 --- a/examples/sensors/accelbubble/accelbubble.pro +++ b/examples/sensors/accelbubble/accelbubble.pro @@ -6,12 +6,10 @@ SOURCES = main.cpp RESOURCES += \ accelbubble.qrc -app.files = \ +OTHER_FILES = \ $$files(*.qml) \ - icon.png \ content \ images -target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/accelbubble -app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/accelbubble -INSTALLS += target app +target.path = $$[QT_INSTALL_EXAMPLES]/sensors/accelbubble +INSTALLS += target diff --git a/examples/sensors/accelbubble/icon.png b/examples/sensors/accelbubble/icon.png deleted file mode 100644 index d74f1111..00000000 Binary files a/examples/sensors/accelbubble/icon.png and /dev/null differ diff --git a/examples/sensors/cubehouse/cubehouse.pro b/examples/sensors/cubehouse/cubehouse.pro index 9f543082..18191d38 100644 --- a/examples/sensors/cubehouse/cubehouse.pro +++ b/examples/sensors/cubehouse/cubehouse.pro @@ -3,15 +3,13 @@ TARGET = cubehouse QT += quick SOURCES = main.cpp -app.files = \ +OTHER_FILES = \ $$files(*.qml) \ - icon.png \ content \ mesh -target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/cubehouse -app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/cubehouse -INSTALLS += target app +target.path = $$[QT_INSTALL_EXAMPLES]/sensors/cubehouse +INSTALLS += target RESOURCES += \ cubehouse.qrc diff --git a/examples/sensors/cubehouse/icon.png b/examples/sensors/cubehouse/icon.png deleted file mode 100644 index 193ad561..00000000 Binary files a/examples/sensors/cubehouse/icon.png and /dev/null differ diff --git a/examples/sensors/grue/icon.png b/examples/sensors/grue/icon.png deleted file mode 100644 index f3f038c7..00000000 Binary files a/examples/sensors/grue/icon.png and /dev/null differ diff --git a/examples/sensors/grue/qml.pro b/examples/sensors/grue/qml.pro index 191098ec..11d2c1de 100644 --- a/examples/sensors/grue/qml.pro +++ b/examples/sensors/grue/qml.pro @@ -10,11 +10,9 @@ SOURCES = main.cpp RESOURCES += \ qml.qrc -app.files = \ - icon.png \ +OTHER_FILES = \ $$files(*.qml) \ grue.png target.path = $$[QT_INSTALL_EXAMPLES]/sensors/grue -app.path = $$[QT_INSTALL_EXAMPLES]/sensors/grue -INSTALLS += target app +INSTALLS += target diff --git a/examples/sensors/maze/icon.png b/examples/sensors/maze/icon.png deleted file mode 100644 index 1e7ff8d8..00000000 Binary files a/examples/sensors/maze/icon.png and /dev/null differ diff --git a/examples/sensors/maze/maze.pro b/examples/sensors/maze/maze.pro index b57c0a98..e4c4d866 100644 --- a/examples/sensors/maze/maze.pro +++ b/examples/sensors/maze/maze.pro @@ -3,16 +3,14 @@ TARGET = maze QT += quick SOURCES = main.cpp -app.files = \ +OTHER_FILES = \ components \ $$files(*.qml) \ $$files(*.js) \ - icon.png \ content -target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/maze -app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/maze -INSTALLS += target app +target.path = $$[QT_INSTALL_EXAMPLES]/sensors/maze +INSTALLS += target RESOURCES += \ maze.qrc diff --git a/examples/sensors/qmlqtsensors/icon.png b/examples/sensors/qmlqtsensors/icon.png deleted file mode 100644 index d3243c5b..00000000 Binary files a/examples/sensors/qmlqtsensors/icon.png and /dev/null differ diff --git a/examples/sensors/qmlqtsensors/qmlqtsensors.pro b/examples/sensors/qmlqtsensors/qmlqtsensors.pro index b63bd6ac..6add64dc 100644 --- a/examples/sensors/qmlqtsensors/qmlqtsensors.pro +++ b/examples/sensors/qmlqtsensors/qmlqtsensors.pro @@ -6,11 +6,9 @@ SOURCES = main.cpp RESOURCES += \ qmlqtsensors.qrc -app.files = \ +OTHER_FILES = \ $$files(*.qml) \ - icon.png \ components -target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/qmlqtsensors -app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/qmlqtsensors -INSTALLS += target app +target.path = $$[QT_INSTALL_EXAMPLES]/sensors/qmlqtsensors +INSTALLS += target diff --git a/examples/sensors/qmlsensorgestures/icon.png b/examples/sensors/qmlsensorgestures/icon.png deleted file mode 100644 index c445bd7f..00000000 Binary files a/examples/sensors/qmlsensorgestures/icon.png and /dev/null differ diff --git a/examples/sensors/qmlsensorgestures/qml.pro b/examples/sensors/qmlsensorgestures/qml.pro index 9bcba7fd..6191f322 100644 --- a/examples/sensors/qmlsensorgestures/qml.pro +++ b/examples/sensors/qmlsensorgestures/qml.pro @@ -3,13 +3,11 @@ TARGET = qmlsensorgestures QT += quick SOURCES = main.cpp -app.files = \ - $$files(*.qml) \ - icon.png +OTHER_FILES = \ + $$files(*.qml) -target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/qmlsensorgestures -app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/qmlsensorgestures -INSTALLS += target app +target.path = $$[QT_INSTALL_EXAMPLES]/sensors/qmlsensorgestures +INSTALLS += target RESOURCES += \ qml.qrc diff --git a/examples/sensors/sensor_explorer/icon.png b/examples/sensors/sensor_explorer/icon.png deleted file mode 100644 index c48b6095..00000000 Binary files a/examples/sensors/sensor_explorer/icon.png and /dev/null differ diff --git a/examples/sensors/sensor_explorer/qml.pro b/examples/sensors/sensor_explorer/qml.pro index e2324a84..1407d5b2 100644 --- a/examples/sensors/sensor_explorer/qml.pro +++ b/examples/sensors/sensor_explorer/qml.pro @@ -11,13 +11,11 @@ win32: DESTDIR = ./ SOURCES = main.cpp -app.files = \ - sensor_explorer.qml \ - icon.png +OTHER_FILES = \ + sensor_explorer.qml target.path = $$[QT_INSTALL_EXAMPLES]/sensors/sensor_explorer -app.path = $$[QT_INSTALL_EXAMPLES]/sensors/sensor_explorer -INSTALLS += target app +INSTALLS += target RESOURCES += \ qml.qrc diff --git a/examples/sensors/sensorgestures/gesture.png b/examples/sensors/sensorgestures/gesture.png deleted file mode 100644 index 707d5c4e..00000000 Binary files a/examples/sensors/sensorgestures/gesture.png and /dev/null differ diff --git a/examples/sensors/sensorgestures/sensorgestures.pro b/examples/sensors/sensorgestures/sensorgestures.pro index 38a471d6..a60728e7 100644 --- a/examples/sensors/sensorgestures/sensorgestures.pro +++ b/examples/sensors/sensorgestures/sensorgestures.pro @@ -9,7 +9,5 @@ HEADERS += mainwindow.h FORMS += mainwindow.ui -target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/sensorgestures -app.files = gesture.png -app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/sensorgestures -INSTALLS += target app +target.path = $$[QT_INSTALL_EXAMPLES]/sensors/sensorgestures +INSTALLS += target diff --git a/examples/sensors/shakeit/icon.png b/examples/sensors/shakeit/icon.png deleted file mode 100644 index d8f21546..00000000 Binary files a/examples/sensors/shakeit/icon.png and /dev/null differ diff --git a/examples/sensors/shakeit/shakeit.pro b/examples/sensors/shakeit/shakeit.pro index cb36f739..5e07f062 100644 --- a/examples/sensors/shakeit/shakeit.pro +++ b/examples/sensors/shakeit/shakeit.pro @@ -6,12 +6,10 @@ SOURCES = main.cpp RESOURCES += \ shakeit.qrc -app.files = \ +OTHER_FILES = \ $$files(*.qml) \ - icon.png \ audio \ content target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/shakeit -app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/shakeit -INSTALLS += target app +INSTALLS += target -- cgit v1.2.3