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/tools | |
| 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/tools')
| -rw-r--r-- | examples/tools/contiguouscache/contiguouscache.pro | 4 | ||||
| -rw-r--r-- | examples/tools/customtype/customtype.pro | 4 | ||||
| -rw-r--r-- | examples/tools/customtypesending/customtypesending.pro | 4 | ||||
| -rw-r--r-- | examples/tools/tools.pro | 6 |
4 files changed, 3 insertions, 15 deletions
diff --git a/examples/tools/contiguouscache/contiguouscache.pro b/examples/tools/contiguouscache/contiguouscache.pro index 2b8b3e9365..62cf862795 100644 --- a/examples/tools/contiguouscache/contiguouscache.pro +++ b/examples/tools/contiguouscache/contiguouscache.pro @@ -4,9 +4,7 @@ SOURCES = randomlistmodel.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/contiguouscache -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS contiguouscache.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/contiguouscache -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/tools/customtype/customtype.pro b/examples/tools/customtype/customtype.pro index 5282de0acb..4b6625d742 100644 --- a/examples/tools/customtype/customtype.pro +++ b/examples/tools/customtype/customtype.pro @@ -5,9 +5,7 @@ QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS customcompleter.pro resources -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/tools/customtypesending/customtypesending.pro b/examples/tools/customtypesending/customtypesending.pro index b86c101577..48bdd5d504 100644 --- a/examples/tools/customtypesending/customtypesending.pro +++ b/examples/tools/customtypesending/customtypesending.pro @@ -7,9 +7,7 @@ QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS customcompleter.pro resources -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/tools/tools.pro b/examples/tools/tools.pro index 4f02e01f61..10b487d6ae 100644 --- a/examples/tools/tools.pro +++ b/examples/tools/tools.pro @@ -3,9 +3,3 @@ CONFIG += ordered SUBDIRS = contiguouscache \ customtype \ customtypesending - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/tools -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tools.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/tools -INSTALLS += target sources |