diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-27 20:40:16 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-29 20:21:11 +0100 |
commit | aeb036ed8715d0c099d3dca87f7def4dbaf8e9b4 (patch) | |
tree | 95a679c8b456c61bc108e1a68b0aced288313df6 /examples/touch | |
parent | 12dcab77a7248268c58c2c5431c2c237e14d1089 (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/touch')
-rw-r--r-- | examples/touch/dials/dials.pro | 4 | ||||
-rw-r--r-- | examples/touch/fingerpaint/fingerpaint.pro | 4 | ||||
-rw-r--r-- | examples/touch/knobs/knobs.pro | 4 | ||||
-rw-r--r-- | examples/touch/pinchzoom/pinchzoom.pro | 4 | ||||
-rw-r--r-- | examples/touch/touch.pro | 6 |
5 files changed, 4 insertions, 18 deletions
diff --git a/examples/touch/dials/dials.pro b/examples/touch/dials/dials.pro index c6259962e0..0da1103432 100644 --- a/examples/touch/dials/dials.pro +++ b/examples/touch/dials/dials.pro @@ -3,9 +3,7 @@ FORMS += dials.ui # install target.path = $$[QT_INSTALL_EXAMPLES]/touch/dials -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dials.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/touch/dials -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/touch/fingerpaint/fingerpaint.pro b/examples/touch/fingerpaint/fingerpaint.pro index a47aa98f67..a9083b39ca 100644 --- a/examples/touch/fingerpaint/fingerpaint.pro +++ b/examples/touch/fingerpaint/fingerpaint.pro @@ -6,9 +6,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/touch/fingerpaint -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fingerpaint.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/touch/fingerpaint -INSTALLS += target sources +INSTALLS += target QT += widgets !isEmpty(QT.printsupport.name): QT += printsupport diff --git a/examples/touch/knobs/knobs.pro b/examples/touch/knobs/knobs.pro index bf0c45845f..7540a4b2cf 100644 --- a/examples/touch/knobs/knobs.pro +++ b/examples/touch/knobs/knobs.pro @@ -3,9 +3,7 @@ SOURCES = main.cpp knob.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/touch/knobs -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS knobs.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/touch/knobs -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/touch/pinchzoom/pinchzoom.pro b/examples/touch/pinchzoom/pinchzoom.pro index f841041e35..df7ce246c3 100644 --- a/examples/touch/pinchzoom/pinchzoom.pro +++ b/examples/touch/pinchzoom/pinchzoom.pro @@ -11,9 +11,7 @@ RESOURCES += \ # install target.path = $$[QT_INSTALL_EXAMPLES]/touch/pinchzoom -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS pinchzoom.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/touch/pinchzoom -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/touch/touch.pro b/examples/touch/touch.pro index cfbae8b590..d5983eb581 100644 --- a/examples/touch/touch.pro +++ b/examples/touch/touch.pro @@ -1,8 +1,2 @@ TEMPLATE = subdirs SUBDIRS = pinchzoom fingerpaint knobs dials - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/touch -sources.files = touch.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/touch -INSTALLS += target sources |