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/xml | |
| 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/xml')
| -rw-r--r-- | examples/xml/dombookmarks/dombookmarks.pro | 6 | ||||
| -rw-r--r-- | examples/xml/htmlinfo/htmlinfo.pro | 4 | ||||
| -rw-r--r-- | examples/xml/rsslisting/rsslisting.pro | 4 | ||||
| -rw-r--r-- | examples/xml/saxbookmarks/saxbookmarks.pro | 6 | ||||
| -rw-r--r-- | examples/xml/streambookmarks/streambookmarks.pro | 6 | ||||
| -rw-r--r-- | examples/xml/xml.pro | 7 | ||||
| -rw-r--r-- | examples/xml/xmlstreamlint/xmlstreamlint.pro | 4 |
7 files changed, 12 insertions, 25 deletions
diff --git a/examples/xml/dombookmarks/dombookmarks.pro b/examples/xml/dombookmarks/dombookmarks.pro index 42fdb17137..93a5fb9ac9 100644 --- a/examples/xml/dombookmarks/dombookmarks.pro +++ b/examples/xml/dombookmarks/dombookmarks.pro @@ -5,11 +5,11 @@ SOURCES = main.cpp \ xbeltree.cpp QT += xml widgets +EXAMPLE_FILES = frank.xbel jennifer.xbel + # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/dombookmarks -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dombookmarks.pro *.xbel -sources.path = $$[QT_INSTALL_EXAMPLES]/xml/dombookmarks -INSTALLS += target sources +INSTALLS += target wince*: { addFiles.files = frank.xbel jennifer.xbel diff --git a/examples/xml/htmlinfo/htmlinfo.pro b/examples/xml/htmlinfo/htmlinfo.pro index 503ff4060b..9e58973db6 100644 --- a/examples/xml/htmlinfo/htmlinfo.pro +++ b/examples/xml/htmlinfo/htmlinfo.pro @@ -14,6 +14,4 @@ wince*:{ # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/htmlinfo -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.html htmlinfo.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/xml/htmlinfo -INSTALLS += target sources +INSTALLS += target diff --git a/examples/xml/rsslisting/rsslisting.pro b/examples/xml/rsslisting/rsslisting.pro index 0cbf2437f8..5997f96ca9 100644 --- a/examples/xml/rsslisting/rsslisting.pro +++ b/examples/xml/rsslisting/rsslisting.pro @@ -4,6 +4,4 @@ QT += network xml widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/rsslisting -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS rsslisting.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/xml/rsslisting -INSTALLS += target sources +INSTALLS += target diff --git a/examples/xml/saxbookmarks/saxbookmarks.pro b/examples/xml/saxbookmarks/saxbookmarks.pro index cf9cc140bb..6723b0c6fc 100644 --- a/examples/xml/saxbookmarks/saxbookmarks.pro +++ b/examples/xml/saxbookmarks/saxbookmarks.pro @@ -7,11 +7,11 @@ SOURCES = main.cpp \ xbelhandler.cpp QT += xml widgets +EXAMPLE_FILES = frank.xbel jennifer.xbel + # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/saxbookmarks -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS saxbookmarks.pro *.xbel -sources.path = $$[QT_INSTALL_EXAMPLES]/xml/saxbookmarks -INSTALLS += target sources +INSTALLS += target wince*: { addFiles.files = frank.xbel jennifer.xbel diff --git a/examples/xml/streambookmarks/streambookmarks.pro b/examples/xml/streambookmarks/streambookmarks.pro index 27d84ae68b..62aac0eef3 100644 --- a/examples/xml/streambookmarks/streambookmarks.pro +++ b/examples/xml/streambookmarks/streambookmarks.pro @@ -7,8 +7,8 @@ SOURCES = main.cpp \ xbelwriter.cpp QT += xml widgets +EXAMPLE_FILES = frank.xbel jennifer.xbel + # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/streambookmarks -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS streambookmarks.pro *.xbel -sources.path = $$[QT_INSTALL_EXAMPLES]/xml/streambookmarks -INSTALLS += target sources +INSTALLS += target diff --git a/examples/xml/xml.pro b/examples/xml/xml.pro index 739ada31c7..7c7b6f7456 100644 --- a/examples/xml/xml.pro +++ b/examples/xml/xml.pro @@ -8,10 +8,3 @@ SUBDIRS = htmlinfo \ saxbookmarks \ streambookmarks } - - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/xml -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xml.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/xml -INSTALLS += target sources diff --git a/examples/xml/xmlstreamlint/xmlstreamlint.pro b/examples/xml/xmlstreamlint/xmlstreamlint.pro index d237740eff..295db2bc31 100644 --- a/examples/xml/xmlstreamlint/xmlstreamlint.pro +++ b/examples/xml/xmlstreamlint/xmlstreamlint.pro @@ -6,9 +6,7 @@ SOURCES += main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/xmlstreamlint -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xmlstreamlint.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/xml/xmlstreamlint -INSTALLS += target sources +INSTALLS += target simulator: warning(This example does not work on Simulator platform) |