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/desktop | |
| 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/desktop')
| -rw-r--r-- | examples/widgets/desktop/desktop.pro | 6 | ||||
| -rw-r--r-- | examples/widgets/desktop/screenshot/screenshot.pro | 4 | ||||
| -rw-r--r-- | examples/widgets/desktop/systray/systray.pro | 4 |
3 files changed, 2 insertions, 12 deletions
diff --git a/examples/widgets/desktop/desktop.pro b/examples/widgets/desktop/desktop.pro index 79d85e41fa..5da59599d4 100644 --- a/examples/widgets/desktop/desktop.pro +++ b/examples/widgets/desktop/desktop.pro @@ -2,10 +2,4 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS = screenshot systray -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS desktop.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop -INSTALLS += target sources - QT += widgets diff --git a/examples/widgets/desktop/screenshot/screenshot.pro b/examples/widgets/desktop/screenshot/screenshot.pro index bcab23918b..31ea646af0 100644 --- a/examples/widgets/desktop/screenshot/screenshot.pro +++ b/examples/widgets/desktop/screenshot/screenshot.pro @@ -4,9 +4,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop/screenshot -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS screenshot.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop/screenshot -INSTALLS += target sources +INSTALLS += target QT += widgets simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/desktop/systray/systray.pro b/examples/widgets/desktop/systray/systray.pro index c028b04f04..270f950f10 100644 --- a/examples/widgets/desktop/systray/systray.pro +++ b/examples/widgets/desktop/systray/systray.pro @@ -7,8 +7,6 @@ QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop/systray -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS systray.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop/systray -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) |