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/qtestlib | |
| 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/qtestlib')
| -rw-r--r-- | examples/qtestlib/qtestlib.pro | 6 | ||||
| -rw-r--r-- | examples/qtestlib/tutorial1/tutorial1.pro | 4 | ||||
| -rw-r--r-- | examples/qtestlib/tutorial2/tutorial2.pro | 4 | ||||
| -rw-r--r-- | examples/qtestlib/tutorial3/tutorial3.pro | 4 | ||||
| -rw-r--r-- | examples/qtestlib/tutorial4/tutorial4.pro | 4 | ||||
| -rw-r--r-- | examples/qtestlib/tutorial5/tutorial5.pro | 4 |
6 files changed, 5 insertions, 21 deletions
diff --git a/examples/qtestlib/qtestlib.pro b/examples/qtestlib/qtestlib.pro index 8addbcba63..383e5aa9e3 100644 --- a/examples/qtestlib/qtestlib.pro +++ b/examples/qtestlib/qtestlib.pro @@ -1,8 +1,2 @@ TEMPLATE = subdirs SUBDIRS = tutorial1 tutorial2 tutorial3 tutorial4 tutorial5 - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtestlib.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib -INSTALLS += target sources diff --git a/examples/qtestlib/tutorial1/tutorial1.pro b/examples/qtestlib/tutorial1/tutorial1.pro index 016de61d7b..8e77a9c5ff 100644 --- a/examples/qtestlib/tutorial1/tutorial1.pro +++ b/examples/qtestlib/tutorial1/tutorial1.pro @@ -3,8 +3,6 @@ QT += testlib # install target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial1 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial1 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/qtestlib/tutorial2/tutorial2.pro b/examples/qtestlib/tutorial2/tutorial2.pro index b8f73a9b52..58e70d4508 100644 --- a/examples/qtestlib/tutorial2/tutorial2.pro +++ b/examples/qtestlib/tutorial2/tutorial2.pro @@ -3,8 +3,6 @@ QT += testlib # install target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial2 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial2 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/qtestlib/tutorial3/tutorial3.pro b/examples/qtestlib/tutorial3/tutorial3.pro index 18183226ef..918dbf1187 100644 --- a/examples/qtestlib/tutorial3/tutorial3.pro +++ b/examples/qtestlib/tutorial3/tutorial3.pro @@ -3,8 +3,6 @@ QT += testlib # install target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial3 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial3 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/qtestlib/tutorial4/tutorial4.pro b/examples/qtestlib/tutorial4/tutorial4.pro index 6c82aa6500..f7b40dd4ca 100644 --- a/examples/qtestlib/tutorial4/tutorial4.pro +++ b/examples/qtestlib/tutorial4/tutorial4.pro @@ -3,8 +3,6 @@ QT += testlib # install target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial4 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial4 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/qtestlib/tutorial5/tutorial5.pro b/examples/qtestlib/tutorial5/tutorial5.pro index 3120c40912..facb21ea14 100644 --- a/examples/qtestlib/tutorial5/tutorial5.pro +++ b/examples/qtestlib/tutorial5/tutorial5.pro @@ -3,8 +3,6 @@ QT += testlib # install target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial5 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial5 -INSTALLS += target sources +INSTALLS += target QT += widgets |