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/widgets/effects | |
| 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/widgets/effects')
| -rw-r--r-- | examples/widgets/effects/blurpicker/blurpicker.pro | 4 | ||||
| -rw-r--r-- | examples/widgets/effects/effects.pro | 6 | ||||
| -rw-r--r-- | examples/widgets/effects/fademessage/fademessage.pro | 10 | ||||
| -rw-r--r-- | examples/widgets/effects/lighting/lighting.pro | 4 |
4 files changed, 3 insertions, 21 deletions
diff --git a/examples/widgets/effects/blurpicker/blurpicker.pro b/examples/widgets/effects/blurpicker/blurpicker.pro index 105b7a49e7..1d232190ac 100644 --- a/examples/widgets/effects/blurpicker/blurpicker.pro +++ b/examples/widgets/effects/blurpicker/blurpicker.pro @@ -4,8 +4,6 @@ RESOURCES += blurpicker.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/blurpicker -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blurpicker.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/blurpicker -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/effects/effects.pro b/examples/widgets/effects/effects.pro index 74c2d1c039..ee3d655815 100644 --- a/examples/widgets/effects/effects.pro +++ b/examples/widgets/effects/effects.pro @@ -5,10 +5,4 @@ SUBDIRS = \ lighting \ fademessage -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS effects.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects -INSTALLS += target sources - QT += widgets diff --git a/examples/widgets/effects/fademessage/fademessage.pro b/examples/widgets/effects/fademessage/fademessage.pro index 89953eb18b..ff860af4f1 100644 --- a/examples/widgets/effects/fademessage/fademessage.pro +++ b/examples/widgets/effects/fademessage/fademessage.pro @@ -1,18 +1,10 @@ SOURCES += main.cpp fademessage.cpp HEADERS += fademessage.h RESOURCES += fademessage.qrc -INSTALLS += target sources # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/fademessage -sources.files = $$SOURCES \ - $$HEADERS \ - $$RESOURCES \ - $$FORMS \ - fademessage.pro \ - background.jpg -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/fademessage - +INSTALLS += target QT += widgets simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/effects/lighting/lighting.pro b/examples/widgets/effects/lighting/lighting.pro index 2ab7811e4f..5450b62093 100644 --- a/examples/widgets/effects/lighting/lighting.pro +++ b/examples/widgets/effects/lighting/lighting.pro @@ -3,9 +3,7 @@ HEADERS += lighting.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/lighting -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS lighting.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/lighting -INSTALLS += target sources +INSTALLS += target QT += widgets |