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/tools/echoplugin | |
| 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/tools/echoplugin')
| -rw-r--r-- | examples/widgets/tools/echoplugin/echoplugin.pro | 4 | ||||
| -rw-r--r-- | examples/widgets/tools/echoplugin/echowindow/echowindow.pro | 4 | ||||
| -rw-r--r-- | examples/widgets/tools/echoplugin/plugin/plugin.pro | 7 |
3 files changed, 5 insertions, 10 deletions
diff --git a/examples/widgets/tools/echoplugin/echoplugin.pro b/examples/widgets/tools/echoplugin/echoplugin.pro index ffd48fd25f..685227c6c4 100644 --- a/examples/widgets/tools/echoplugin/echoplugin.pro +++ b/examples/widgets/tools/echoplugin/echoplugin.pro @@ -6,8 +6,6 @@ SUBDIRS = echowindow \ # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS echoplugin.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/echoplugin/echowindow/echowindow.pro b/examples/widgets/tools/echoplugin/echowindow/echowindow.pro index 90bc831de1..cd91693ec0 100644 --- a/examples/widgets/tools/echoplugin/echowindow/echowindow.pro +++ b/examples/widgets/tools/echoplugin/echowindow/echowindow.pro @@ -14,9 +14,7 @@ win32 { # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS echowindow.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin/echowindow -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/echoplugin/plugin/plugin.pro b/examples/widgets/tools/echoplugin/plugin/plugin.pro index 532a382586..a586130b76 100644 --- a/examples/widgets/tools/echoplugin/plugin/plugin.pro +++ b/examples/widgets/tools/echoplugin/plugin/plugin.pro @@ -4,15 +4,14 @@ CONFIG += plugin INCLUDEPATH += ../echowindow HEADERS = echoplugin.h SOURCES = echoplugin.cpp -OTHER_FILES += echoplugin.json TARGET = $$qtLibraryTarget(echoplugin) DESTDIR = ../plugins #! [0] +EXAMPLE_FILES = echoplugin.json + # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin/plugin -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugin.pro echoplugin.json -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin/plugin -INSTALLS += target sources +INSTALLS += target QT += widgets |