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/graphicsview | |
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/graphicsview')
14 files changed, 13 insertions, 47 deletions
diff --git a/examples/widgets/graphicsview/anchorlayout/anchorlayout.pro b/examples/widgets/graphicsview/anchorlayout/anchorlayout.pro index 8fb03edd60..bc396226c8 100644 --- a/examples/widgets/graphicsview/anchorlayout/anchorlayout.pro +++ b/examples/widgets/graphicsview/anchorlayout/anchorlayout.pro @@ -2,9 +2,7 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/anchorlayout -sources.files = $$SOURCES $$HEADERS $$RESOURCES anchorlayout.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/anchorlayout -INSTALLS += target sources +INSTALLS += target TARGET = anchorlayout QT += widgets diff --git a/examples/widgets/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro b/examples/widgets/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro index 3de54d7757..59abd2b405 100644 --- a/examples/widgets/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro +++ b/examples/widgets/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro @@ -7,8 +7,6 @@ RESOURCES = basicgraphicslayouts.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/basicgraphicslayouts -sources.files = $$SOURCES $$HEADERS $$RESOURCES basicgraphicslayouts.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/basicgraphicslayouts -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/graphicsview/boxes/boxes.pro b/examples/widgets/graphicsview/boxes/boxes.pro index 1fc91352c7..a4b253c580 100644 --- a/examples/widgets/graphicsview/boxes/boxes.pro +++ b/examples/widgets/graphicsview/boxes/boxes.pro @@ -21,11 +21,7 @@ RESOURCES += boxes.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/boxes -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg *.png *.fsh *.vsh *.par -sources.files -= 3rdparty/fbm.h 3rdparty/fbm.c -sources.files += 3rdparty -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/boxes -INSTALLS += target sources +INSTALLS += target wince*: { DEPLOYMENT_PLUGIN += qjpeg diff --git a/examples/widgets/graphicsview/chip/chip.pro b/examples/widgets/graphicsview/chip/chip.pro index a979d60da0..8e3d91f38e 100644 --- a/examples/widgets/graphicsview/chip/chip.pro +++ b/examples/widgets/graphicsview/chip/chip.pro @@ -15,7 +15,5 @@ build_all:!build_pass { # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/chip -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/chip -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/graphicsview/collidingmice/collidingmice.pro b/examples/widgets/graphicsview/collidingmice/collidingmice.pro index 10755cdb65..0337b6da4a 100644 --- a/examples/widgets/graphicsview/collidingmice/collidingmice.pro +++ b/examples/widgets/graphicsview/collidingmice/collidingmice.pro @@ -9,9 +9,7 @@ RESOURCES += \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/collidingmice -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS collidingmice.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/collidingmice -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/graphicsview/diagramscene/diagramscene.pro b/examples/widgets/graphicsview/diagramscene/diagramscene.pro index cc97758b43..ac70e7af17 100644 --- a/examples/widgets/graphicsview/diagramscene/diagramscene.pro +++ b/examples/widgets/graphicsview/diagramscene/diagramscene.pro @@ -14,9 +14,7 @@ RESOURCES = diagramscene.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/diagramscene -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS diagramscene.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/diagramscene -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.pro b/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.pro index 1e21ee8b9e..4f8cebc755 100644 --- a/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.pro +++ b/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.pro @@ -13,9 +13,7 @@ RESOURCES += \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/dragdroprobot -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dragdroprobot.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/dragdroprobot -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/graphicsview/elasticnodes/elasticnodes.pro b/examples/widgets/graphicsview/elasticnodes/elasticnodes.pro index 3fd8bc714f..71ac21ffe9 100644 --- a/examples/widgets/graphicsview/elasticnodes/elasticnodes.pro +++ b/examples/widgets/graphicsview/elasticnodes/elasticnodes.pro @@ -11,8 +11,6 @@ SOURCES += \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/elasticnodes -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS elasticnodes.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/elasticnodes -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialogs.pro b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialogs.pro index 7b62473050..dd01312788 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialogs.pro +++ b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialogs.pro @@ -12,8 +12,6 @@ build_all:!build_pass { # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/embeddeddialogs -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.png *.jpg *.plist *.icns *.ico *.rc *.pro *.html *.doc images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/embeddeddialogs -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/graphicsview/flowlayout/flowlayout.pro b/examples/widgets/graphicsview/flowlayout/flowlayout.pro index 8a98c87032..ec5ef17a0e 100644 --- a/examples/widgets/graphicsview/flowlayout/flowlayout.pro +++ b/examples/widgets/graphicsview/flowlayout/flowlayout.pro @@ -7,8 +7,6 @@ SOURCES += flowlayout.cpp main.cpp window.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/flowlayout -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/flowlayout -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/graphicsview/graphicsview.pro b/examples/widgets/graphicsview/graphicsview.pro index 590e79c5d2..f7142709c8 100644 --- a/examples/widgets/graphicsview/graphicsview.pro +++ b/examples/widgets/graphicsview/graphicsview.pro @@ -19,10 +19,4 @@ contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, SUBDIRS += boxes } -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS graphicsview.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview -INSTALLS += target sources - QT += widgets diff --git a/examples/widgets/graphicsview/padnavigator/padnavigator.pro b/examples/widgets/graphicsview/padnavigator/padnavigator.pro index efbb09308f..460cc90219 100644 --- a/examples/widgets/graphicsview/padnavigator/padnavigator.pro +++ b/examples/widgets/graphicsview/padnavigator/padnavigator.pro @@ -21,8 +21,6 @@ contains(QT_CONFIG, opengl):QT += opengl # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/padnavigator -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS padnavigator.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/padnavigator -INSTALLS += target sources +INSTALLS += target CONFIG += console diff --git a/examples/widgets/graphicsview/simpleanchorlayout/simpleanchorlayout.pro b/examples/widgets/graphicsview/simpleanchorlayout/simpleanchorlayout.pro index 0378c375a1..c8c992adbe 100644 --- a/examples/widgets/graphicsview/simpleanchorlayout/simpleanchorlayout.pro +++ b/examples/widgets/graphicsview/simpleanchorlayout/simpleanchorlayout.pro @@ -2,9 +2,7 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/simpleanchorlayout -sources.files = $$SOURCES $$HEADERS $$RESOURCES simpleanchorlayout.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/simpleanchorlayout -INSTALLS += target sources +INSTALLS += target TARGET = simpleanchorlayout QT += widgets diff --git a/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro b/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro index 5cd625f9b4..cb44ac4ec2 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro +++ b/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro @@ -5,8 +5,6 @@ RESOURCES += weatheranchorlayout.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/weatheranchorlayout -sources.files = $$SOURCES $$HEADERS $$RESOURCES weatheranchorlayout.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/weatheranchorlayout -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) |