summaryrefslogtreecommitdiffstats
path: root/examples/dbus
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-11-27 20:40:16 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-29 20:21:11 +0100
commitaeb036ed8715d0c099d3dca87f7def4dbaf8e9b4 (patch)
tree95a679c8b456c61bc108e1a68b0aced288313df6 /examples/dbus
parent12dcab77a7248268c58c2c5431c2c237e14d1089 (diff)
centralize and fixup example sources install targets
it's confusing for the users if the examples' project files contain code to install their own sources. also, this constitutes an enormous code duplication, and lots of mistakes. consequently, automate it. more or less as a side effect, this also removes the entirely meaningless target installs in subdirs projects. Task-number: QTBUG-28184 Change-Id: I9fc1367a06db9e2c46aeb67d68729a4f67163ef9 Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'examples/dbus')
-rw-r--r--examples/dbus/chat/chat.pro4
-rw-r--r--examples/dbus/complexpingpong/complexping.pro4
-rw-r--r--examples/dbus/complexpingpong/complexpong.pro4
-rw-r--r--examples/dbus/dbus.pro6
-rw-r--r--examples/dbus/listnames/listnames.pro4
-rw-r--r--examples/dbus/pingpong/ping.pro4
-rw-r--r--examples/dbus/pingpong/pong.pro4
-rw-r--r--examples/dbus/remotecontrolledcar/car/car.pro4
-rw-r--r--examples/dbus/remotecontrolledcar/controller/controller.pro4
-rw-r--r--examples/dbus/remotecontrolledcar/remotecontrolledcar.pro5
10 files changed, 8 insertions, 35 deletions
diff --git a/examples/dbus/chat/chat.pro b/examples/dbus/chat/chat.pro
index 5c78405804..17947e099f 100644
--- a/examples/dbus/chat/chat.pro
+++ b/examples/dbus/chat/chat.pro
@@ -9,8 +9,6 @@ DBUS_INTERFACES += org.example.chat.xml
# install
target.path = $$[QT_INSTALL_EXAMPLES]/dbus/chat
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml
-sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/dbus-chat
-INSTALLS += target sources
+INSTALLS += target
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/complexpingpong/complexping.pro b/examples/dbus/complexpingpong/complexping.pro
index 0f9f37044f..dc9c644fcc 100644
--- a/examples/dbus/complexpingpong/complexping.pro
+++ b/examples/dbus/complexpingpong/complexping.pro
@@ -5,8 +5,6 @@ HEADERS += complexping.h ping-common.h
SOURCES += complexping.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong
-INSTALLS += target sources
+INSTALLS += target
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 dede78026a..5816f21784 100644
--- a/examples/dbus/complexpingpong/complexpong.pro
+++ b/examples/dbus/complexpingpong/complexpong.pro
@@ -5,8 +5,6 @@ HEADERS += complexpong.h
SOURCES += complexpong.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong
-INSTALLS += target sources
+INSTALLS += target
simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/dbus/dbus.pro b/examples/dbus/dbus.pro
index 2b77665518..89d42bf7fe 100644
--- a/examples/dbus/dbus.pro
+++ b/examples/dbus/dbus.pro
@@ -8,10 +8,4 @@ SUBDIRS = listnames \
remotecontrolledcar
}
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/dbus
-sources.files = *.pro
-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 307036c4aa..f1ebe1dee8 100644
--- a/examples/dbus/listnames/listnames.pro
+++ b/examples/dbus/listnames/listnames.pro
@@ -5,8 +5,6 @@ win32:CONFIG += console
SOURCES += listnames.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/dbus/listnames
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/listnames
-INSTALLS += target sources
+INSTALLS += target
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 448a2b41e4..d753bc69eb 100644
--- a/examples/dbus/pingpong/ping.pro
+++ b/examples/dbus/pingpong/ping.pro
@@ -5,8 +5,6 @@ HEADERS += ping-common.h
SOURCES += ping.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong
-INSTALLS += target sources
+INSTALLS += target
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 046d6f07b6..57c4fab965 100644
--- a/examples/dbus/pingpong/pong.pro
+++ b/examples/dbus/pingpong/pong.pro
@@ -5,8 +5,6 @@ HEADERS += ping-common.h pong.h
SOURCES += pong.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong
-INSTALLS += target sources
+INSTALLS += target
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 e8a4f9e01f..945fb93ae6 100644
--- a/examples/dbus/remotecontrolledcar/car/car.pro
+++ b/examples/dbus/remotecontrolledcar/car/car.pro
@@ -6,8 +6,6 @@ SOURCES += car.cpp main.cpp
# install
target.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/car
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xml
-sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/car
-INSTALLS += target sources
+INSTALLS += target
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 d6bbd9c8ee..1d74bb017f 100644
--- a/examples/dbus/remotecontrolledcar/controller/controller.pro
+++ b/examples/dbus/remotecontrolledcar/controller/controller.pro
@@ -7,8 +7,6 @@ SOURCES += main.cpp controller.cpp
# install
target.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/controller
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml
-sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/controller
-INSTALLS += target sources
+INSTALLS += target
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 519b9b0157..f5a0c27435 100644
--- a/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
+++ b/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
@@ -2,9 +2,4 @@ TEMPLATE = subdirs
SUBDIRS = car \
controller
-# install
-sources.files = *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar
-INSTALLS += sources
-
QT += widgets