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/gettingStarted | |
| 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/gettingStarted')
7 files changed, 5 insertions, 25 deletions
diff --git a/examples/widgets/tutorials/gettingStarted/gettingStarted.pro b/examples/widgets/tutorials/gettingStarted/gettingStarted.pro index 98a834f5f6..b18e6565a6 100644 --- a/examples/widgets/tutorials/gettingStarted/gettingStarted.pro +++ b/examples/widgets/tutorials/gettingStarted/gettingStarted.pro @@ -3,8 +3,3 @@ SUBDIRS += dir_gsqt QT += widgets dir_gsqt.file = gsQt/gsqt.pro - -# install -sources.files = gettingStarted.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted -INSTALLS += sources diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro b/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro index 4a0604fc3f..956d78aa6e 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro @@ -6,9 +6,4 @@ SUBDIRS = part1 \ part4 \ part5 -# install -sources.files = *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt -INSTALLS += sources - QT += widgets diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro index e6eb0d45f2..391606bfd7 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro @@ -4,7 +4,5 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part1 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part1 -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro index c3f30e5810..e7422e4a31 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro @@ -4,7 +4,5 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part2 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part2 -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro index f51e531cbd..1577848de5 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro @@ -4,7 +4,5 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part3 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part3 -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro index 5221bda09d..086fac69e9 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro @@ -4,7 +4,5 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part4 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part4 -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro index a3687aa4b2..032f220b83 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro @@ -4,7 +4,5 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part5 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part5 -INSTALLS += target sources +INSTALLS += target |