From c527dd44be9cee5da06ce397f89e3a2595d4ed37 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 26 Nov 2012 14:04:31 +0100 Subject: Examples: Install to $$[QT_INSTALL_EXAMPLES]/$submodule/$example This makes the structure of the examples after an 'make install' similar to the one in a 'developer build'. Change-Id: I9120bd741fab332e64e30adc01cefe87e5633454 Reviewed-by: Martin Smith --- examples/dbus/complexpingpong/complexping.pro | 4 ++-- examples/dbus/complexpingpong/complexpong.pro | 4 ++-- examples/dbus/dbus-chat/dbus-chat.pro | 4 ++-- examples/dbus/dbus.pro | 4 ++-- examples/dbus/listnames/listnames.pro | 4 ++-- examples/dbus/pingpong/ping.pro | 4 ++-- examples/dbus/pingpong/pong.pro | 4 ++-- examples/dbus/remotecontrolledcar/car/car.pro | 4 ++-- examples/dbus/remotecontrolledcar/controller/controller.pro | 4 ++-- examples/dbus/remotecontrolledcar/remotecontrolledcar.pro | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) (limited to 'examples/dbus') diff --git a/examples/dbus/complexpingpong/complexping.pro b/examples/dbus/complexpingpong/complexping.pro index 6f6f21abc1..0f9f37044f 100644 --- a/examples/dbus/complexpingpong/complexping.pro +++ b/examples/dbus/complexpingpong/complexping.pro @@ -4,9 +4,9 @@ QT += dbus HEADERS += complexping.h ping-common.h SOURCES += complexping.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong +target.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong +sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong INSTALLS += target sources simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/complexpingpong/complexpong.pro b/examples/dbus/complexpingpong/complexpong.pro index 08759bb8d7..dede78026a 100644 --- a/examples/dbus/complexpingpong/complexpong.pro +++ b/examples/dbus/complexpingpong/complexpong.pro @@ -4,9 +4,9 @@ QT += dbus HEADERS += complexpong.h SOURCES += complexpong.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong +target.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong +sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong INSTALLS += target sources simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/dbus-chat/dbus-chat.pro b/examples/dbus/dbus-chat/dbus-chat.pro index e539228ba1..5c78405804 100644 --- a/examples/dbus/dbus-chat/dbus-chat.pro +++ b/examples/dbus/dbus-chat/dbus-chat.pro @@ -8,9 +8,9 @@ DBUS_ADAPTORS += org.example.chat.xml DBUS_INTERFACES += org.example.chat.xml # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/chat +target.path = $$[QT_INSTALL_EXAMPLES]/dbus/chat sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/dbus-chat +sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/dbus-chat INSTALLS += target sources simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/dbus.pro b/examples/dbus/dbus.pro index a6a0ded836..1167421561 100644 --- a/examples/dbus/dbus.pro +++ b/examples/dbus/dbus.pro @@ -9,9 +9,9 @@ SUBDIRS = listnames \ } # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus +target.path = $$[QT_INSTALL_EXAMPLES]/dbus sources.files = *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus +sources.path = $$[QT_INSTALL_EXAMPLES]/dbus INSTALLS += sources QT += widgets diff --git a/examples/dbus/listnames/listnames.pro b/examples/dbus/listnames/listnames.pro index 514fc02e16..307036c4aa 100644 --- a/examples/dbus/listnames/listnames.pro +++ b/examples/dbus/listnames/listnames.pro @@ -4,9 +4,9 @@ win32:CONFIG += console SOURCES += listnames.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/listnames +target.path = $$[QT_INSTALL_EXAMPLES]/dbus/listnames sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/listnames +sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/listnames INSTALLS += target sources simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/pingpong/ping.pro b/examples/dbus/pingpong/ping.pro index 00e764df39..448a2b41e4 100644 --- a/examples/dbus/pingpong/ping.pro +++ b/examples/dbus/pingpong/ping.pro @@ -4,9 +4,9 @@ QT += dbus HEADERS += ping-common.h SOURCES += ping.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong +target.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong +sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong INSTALLS += target sources simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/pingpong/pong.pro b/examples/dbus/pingpong/pong.pro index 3ba21718ff..046d6f07b6 100644 --- a/examples/dbus/pingpong/pong.pro +++ b/examples/dbus/pingpong/pong.pro @@ -4,9 +4,9 @@ QT += dbus HEADERS += ping-common.h pong.h SOURCES += pong.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong +target.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong +sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong INSTALLS += target sources simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/remotecontrolledcar/car/car.pro b/examples/dbus/remotecontrolledcar/car/car.pro index 46a4eaa139..e8a4f9e01f 100644 --- a/examples/dbus/remotecontrolledcar/car/car.pro +++ b/examples/dbus/remotecontrolledcar/car/car.pro @@ -5,9 +5,9 @@ HEADERS += car.h SOURCES += car.cpp main.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/car +target.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/car sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xml -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/car +sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/car INSTALLS += target sources simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/remotecontrolledcar/controller/controller.pro b/examples/dbus/remotecontrolledcar/controller/controller.pro index 5ee37bec71..d6bbd9c8ee 100644 --- a/examples/dbus/remotecontrolledcar/controller/controller.pro +++ b/examples/dbus/remotecontrolledcar/controller/controller.pro @@ -6,9 +6,9 @@ HEADERS += controller.h SOURCES += main.cpp controller.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/controller +target.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/controller sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/controller +sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/controller INSTALLS += target sources simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro b/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro index 2638f917d6..519b9b0157 100644 --- a/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro +++ b/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro @@ -4,7 +4,7 @@ SUBDIRS = car \ # install sources.files = *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar +sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar INSTALLS += sources QT += widgets -- cgit v1.2.3