From 7e5115f55335b2868ec3b560440f2d28863151eb Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Thu, 16 Aug 2012 13:32:00 +1000 Subject: Fix QTBUG-26860 - install examples to qtsensors directory Change-Id: Iab2407798616ed08ce7789020fe47b00e226d62d Reviewed-by: Alex --- examples/sensors/accel/accel.pro | 2 +- examples/sensors/accelbubble/accelbubble.pro | 4 ++-- examples/sensors/cubehouse/cubehouse.pro | 4 ++-- examples/sensors/grue/console_app/console_app.pro | 2 +- examples/sensors/maze/maze.pro | 4 ++-- examples/sensors/qmlqtsensors/qmlqtsensors.pro | 4 ++-- examples/sensors/qmlsensorgestures/qml.pro | 4 ++-- examples/sensors/sensor_explorer/import/import.pro | 5 +---- examples/sensors/sensor_explorer/qml.pro | 4 ++-- examples/sensors/sensorgestures/sensorgestures.pro | 4 ++-- examples/sensors/shakeit/shakeit.pro | 4 ++-- 11 files changed, 19 insertions(+), 22 deletions(-) (limited to 'examples/sensors') diff --git a/examples/sensors/accel/accel.pro b/examples/sensors/accel/accel.pro index 99c97b67..82fa706b 100644 --- a/examples/sensors/accel/accel.pro +++ b/examples/sensors/accel/accel.pro @@ -5,5 +5,5 @@ QT=core sensors SOURCES=main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/accel +target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/accel INSTALLS += target diff --git a/examples/sensors/accelbubble/accelbubble.pro b/examples/sensors/accelbubble/accelbubble.pro index e8e5976b..523ebf0d 100644 --- a/examples/sensors/accelbubble/accelbubble.pro +++ b/examples/sensors/accelbubble/accelbubble.pro @@ -9,6 +9,6 @@ app.files = \ content \ images -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/accelbubble -app.path = $$[QT_INSTALL_EXAMPLES]/sensors/accelbubble +target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/accelbubble +app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/accelbubble INSTALLS += target app diff --git a/examples/sensors/cubehouse/cubehouse.pro b/examples/sensors/cubehouse/cubehouse.pro index 1a08d003..1fd1ef3e 100644 --- a/examples/sensors/cubehouse/cubehouse.pro +++ b/examples/sensors/cubehouse/cubehouse.pro @@ -9,6 +9,6 @@ app.files = \ content \ mesh -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/cubehouse -app.path = $$[QT_INSTALL_EXAMPLES]/sensors/cubehouse +target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/cubehouse +app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/cubehouse INSTALLS += target app diff --git a/examples/sensors/grue/console_app/console_app.pro b/examples/sensors/grue/console_app/console_app.pro index 285fd892..786d2b19 100644 --- a/examples/sensors/grue/console_app/console_app.pro +++ b/examples/sensors/grue/console_app/console_app.pro @@ -4,5 +4,5 @@ CONFIG += console QT=core sensors SOURCES=main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/grue +target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/grue INSTALLS += target diff --git a/examples/sensors/maze/maze.pro b/examples/sensors/maze/maze.pro index f7d5a2aa..2ce23089 100644 --- a/examples/sensors/maze/maze.pro +++ b/examples/sensors/maze/maze.pro @@ -10,6 +10,6 @@ app.files = \ icon.png \ content -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/maze -app.path = $$[QT_INSTALL_EXAMPLES]/sensors/maze +target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/maze +app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/maze INSTALLS += target app diff --git a/examples/sensors/qmlqtsensors/qmlqtsensors.pro b/examples/sensors/qmlqtsensors/qmlqtsensors.pro index facd4e81..5275db55 100644 --- a/examples/sensors/qmlqtsensors/qmlqtsensors.pro +++ b/examples/sensors/qmlqtsensors/qmlqtsensors.pro @@ -8,6 +8,6 @@ app.files = \ icon.png \ components -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/qmlqtsensors -app.path = $$[QT_INSTALL_EXAMPLES]/sensors/qmlqtsensors +target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/qmlqtsensors +app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/qmlqtsensors INSTALLS += target app diff --git a/examples/sensors/qmlsensorgestures/qml.pro b/examples/sensors/qmlsensorgestures/qml.pro index 7c80bd0f..c24dd216 100644 --- a/examples/sensors/qmlsensorgestures/qml.pro +++ b/examples/sensors/qmlsensorgestures/qml.pro @@ -7,6 +7,6 @@ app.files = \ $$files(*.qml) \ icon.png -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/qmlsensorgestures -app.path = $$[QT_INSTALL_EXAMPLES]/sensors/qmlsensorgestures +target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/qmlsensorgestures +app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/qmlsensorgestures INSTALLS += target app diff --git a/examples/sensors/sensor_explorer/import/import.pro b/examples/sensors/sensor_explorer/import/import.pro index 1f97b67e..1248b14a 100644 --- a/examples/sensors/sensor_explorer/import/import.pro +++ b/examples/sensors/sensor_explorer/import/import.pro @@ -9,10 +9,7 @@ QT += qml sensors SOURCES = main.cpp explorer.cpp sensoritem.cpp propertyinfo.cpp HEADERS = explorer.h sensoritem.h propertyinfo.h -MT_SYSROOT=$$(MT_SYSROOT) -!isEmpty(MT_SYSROOT):EXAMPLES_PREFIX=/opt/mt/applications -!isEmpty(EXAMPLES_PREFIX):DESTPATH=$$EXAMPLES_PREFIX/com.nokia.mt.sensor_explorer/imports/Explorer -else:DESTPATH=$$[QT_INSTALL_IMPORTS]/Explorer +DESTPATH=$$[QT_INSTALL_IMPORTS]/Explorer target.path=$$DESTPATH INSTALLS += target diff --git a/examples/sensors/sensor_explorer/qml.pro b/examples/sensors/sensor_explorer/qml.pro index 92edcc96..e5b081f9 100644 --- a/examples/sensors/sensor_explorer/qml.pro +++ b/examples/sensors/sensor_explorer/qml.pro @@ -9,6 +9,6 @@ app.files = \ components \ content -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/sensor_explorer -app.path = $$[QT_INSTALL_EXAMPLES]/sensors/sensor_explorer +target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/sensor_explorer +app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/sensor_explorer INSTALLS += target app diff --git a/examples/sensors/sensorgestures/sensorgestures.pro b/examples/sensors/sensorgestures/sensorgestures.pro index 118246eb..d13462d6 100644 --- a/examples/sensors/sensorgestures/sensorgestures.pro +++ b/examples/sensors/sensorgestures/sensorgestures.pro @@ -9,7 +9,7 @@ HEADERS += mainwindow.h FORMS += mainwindow.ui -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/sensorgestures +target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/sensorgestures app.files = gesture.png -app.path = $$[QT_INSTALL_EXAMPLES]/sensors/sensorgestures +app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/sensorgestures INSTALLS += target app diff --git a/examples/sensors/shakeit/shakeit.pro b/examples/sensors/shakeit/shakeit.pro index 9f963909..73351918 100644 --- a/examples/sensors/shakeit/shakeit.pro +++ b/examples/sensors/shakeit/shakeit.pro @@ -9,6 +9,6 @@ app.files = \ audio \ content -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/shakeit -app.path = $$[QT_INSTALL_EXAMPLES]/sensors/shakeit +target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/shakeit +app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/shakeit INSTALLS += target app -- cgit v1.2.3