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/tutorials/widgets | |
| 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/tutorials/widgets')
5 files changed, 5 insertions, 15 deletions
diff --git a/examples/widgets/tutorials/widgets/childwidget/childwidget.pro b/examples/widgets/tutorials/widgets/childwidget/childwidget.pro index 6f04e9582e..4eeab61be5 100644 --- a/examples/widgets/tutorials/widgets/childwidget/childwidget.pro +++ b/examples/widgets/tutorials/widgets/childwidget/childwidget.pro @@ -2,9 +2,7 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/childwidget -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS childwidget.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/childwidget -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro b/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro index 2655559435..e362f16713 100644 --- a/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro +++ b/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro @@ -2,9 +2,7 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/nestedlayouts -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS nestedlayouts.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/nestedlayouts -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/widgets/toplevel/toplevel.pro b/examples/widgets/tutorials/widgets/toplevel/toplevel.pro index fd2506612c..faa91eb0dd 100644 --- a/examples/widgets/tutorials/widgets/toplevel/toplevel.pro +++ b/examples/widgets/tutorials/widgets/toplevel/toplevel.pro @@ -2,9 +2,7 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/toplevel -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS toplevel.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/toplevel -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/widgets/widgets.pro b/examples/widgets/tutorials/widgets/widgets.pro index 318453e5a7..41cfa1d7f6 100644 --- a/examples/widgets/tutorials/widgets/widgets.pro +++ b/examples/widgets/tutorials/widgets/widgets.pro @@ -3,7 +3,5 @@ SUBDIRS = toplevel childwidget windowlayout nestedlayouts # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS widgets.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro b/examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro index d87f7780f1..6fd115591e 100644 --- a/examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro +++ b/examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro @@ -2,9 +2,7 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/windowlayout -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS windowlayout.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/windowlayout -INSTALLS += target sources +INSTALLS += target QT += widgets |