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/richtext | |
| 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/richtext')
5 files changed, 6 insertions, 18 deletions
diff --git a/examples/widgets/richtext/calendar/calendar.pro b/examples/widgets/richtext/calendar/calendar.pro index eeeb2f9c2e..d98b08a368 100644 --- a/examples/widgets/richtext/calendar/calendar.pro +++ b/examples/widgets/richtext/calendar/calendar.pro @@ -4,8 +4,6 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/calendar -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendar.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/calendar -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/richtext/orderform/orderform.pro b/examples/widgets/richtext/orderform/orderform.pro index a44a3f082e..72ba3a1d25 100644 --- a/examples/widgets/richtext/orderform/orderform.pro +++ b/examples/widgets/richtext/orderform/orderform.pro @@ -6,9 +6,7 @@ SOURCES = detailsdialog.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/orderform -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS orderform.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/orderform -INSTALLS += target sources +INSTALLS += target QT += widgets !isEmpty(QT.printsupport.name): QT += printsupport diff --git a/examples/widgets/richtext/richtext.pro b/examples/widgets/richtext/richtext.pro index f8624e8b33..499733ecec 100644 --- a/examples/widgets/richtext/richtext.pro +++ b/examples/widgets/richtext/richtext.pro @@ -3,9 +3,3 @@ SUBDIRS = calendar \ orderform \ syntaxhighlighter \ textedit - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS richtext.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext -INSTALLS += target sources diff --git a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro index 5bb2cec8cd..e968c1168a 100644 --- a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro +++ b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro @@ -6,9 +6,7 @@ SOURCES = highlighter.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/syntaxhighlighter -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS syntaxhighlighter.pro examples -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/syntaxhighlighter -INSTALLS += target sources +INSTALLS += target wince*: { diff --git a/examples/widgets/richtext/textedit/textedit.pro b/examples/widgets/richtext/textedit/textedit.pro index 35eaf8808c..a2090231c5 100644 --- a/examples/widgets/richtext/textedit/textedit.pro +++ b/examples/widgets/richtext/textedit/textedit.pro @@ -13,11 +13,11 @@ build_all:!build_pass { CONFIG += release } +EXAMPLE_FILES = textedit.qdoc + # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/textedit -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/textedit -INSTALLS += target sources +INSTALLS += target QT += widgets !isEmpty(QT.printsupport.name): QT += printsupport |