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/layouts | |
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/layouts')
5 files changed, 4 insertions, 17 deletions
diff --git a/examples/widgets/layouts/basiclayouts/basiclayouts.pro b/examples/widgets/layouts/basiclayouts/basiclayouts.pro index 39cfa65661..cfa8594516 100644 --- a/examples/widgets/layouts/basiclayouts/basiclayouts.pro +++ b/examples/widgets/layouts/basiclayouts/basiclayouts.pro @@ -4,9 +4,7 @@ SOURCES = dialog.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/basiclayouts -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/basiclayouts -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/layouts/borderlayout/borderlayout.pro b/examples/widgets/layouts/borderlayout/borderlayout.pro index 0260162cbb..2b7d55919a 100644 --- a/examples/widgets/layouts/borderlayout/borderlayout.pro +++ b/examples/widgets/layouts/borderlayout/borderlayout.pro @@ -6,8 +6,6 @@ SOURCES = borderlayout.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/borderlayout -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/borderlayout -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.pro b/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.pro index 43e0606357..293137c426 100644 --- a/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.pro +++ b/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.pro @@ -4,9 +4,7 @@ SOURCES = dialog.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/dynamiclayouts -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/dynamiclayouts -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/layouts/flowlayout/flowlayout.pro b/examples/widgets/layouts/flowlayout/flowlayout.pro index f2a3e99226..bd977f2a0e 100644 --- a/examples/widgets/layouts/flowlayout/flowlayout.pro +++ b/examples/widgets/layouts/flowlayout/flowlayout.pro @@ -6,8 +6,6 @@ SOURCES = flowlayout.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/flowlayout -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/flowlayout -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/layouts/layouts.pro b/examples/widgets/layouts/layouts.pro index 230e6a5ce4..cfd9b4b01c 100644 --- a/examples/widgets/layouts/layouts.pro +++ b/examples/widgets/layouts/layouts.pro @@ -4,9 +4,4 @@ SUBDIRS = basiclayouts \ dynamiclayouts \ flowlayout -# install -sources.files = README *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts -INSTALLS += sources - QT += widgets |