summaryrefslogtreecommitdiffstats
path: root/examples/widgets/painting
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-11-27 20:40:16 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-29 20:21:11 +0100
commitaeb036ed8715d0c099d3dca87f7def4dbaf8e9b4 (patch)
tree95a679c8b456c61bc108e1a68b0aced288313df6 /examples/widgets/painting
parent12dcab77a7248268c58c2c5431c2c237e14d1089 (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/painting')
-rw-r--r--examples/widgets/painting/affine/affine.pro4
-rw-r--r--examples/widgets/painting/basicdrawing/basicdrawing.pro4
-rw-r--r--examples/widgets/painting/composition/composition.pro4
-rw-r--r--examples/widgets/painting/concentriccircles/concentriccircles.pro4
-rw-r--r--examples/widgets/painting/deform/deform.pro4
-rw-r--r--examples/widgets/painting/fontsampler/fontsampler.pro4
-rw-r--r--examples/widgets/painting/gradients/gradients.pro4
-rw-r--r--examples/widgets/painting/imagecomposition/imagecomposition.pro4
-rw-r--r--examples/widgets/painting/painterpaths/painterpaths.pro4
-rw-r--r--examples/widgets/painting/painting.pro6
-rw-r--r--examples/widgets/painting/pathstroke/pathstroke.pro4
-rw-r--r--examples/widgets/painting/shared/shared.pro8
-rw-r--r--examples/widgets/painting/transformations/transformations.pro4
13 files changed, 11 insertions, 47 deletions
diff --git a/examples/widgets/painting/affine/affine.pro b/examples/widgets/painting/affine/affine.pro
index b9c575ebb9..e94f4d12fb 100644
--- a/examples/widgets/painting/affine/affine.pro
+++ b/examples/widgets/painting/affine/affine.pro
@@ -15,9 +15,7 @@ RESOURCES += affine.qrc
# install
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/affine
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg
-sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/affine
-INSTALLS += target sources
+INSTALLS += target
wince*: {
DEPLOYMENT_PLUGIN += qjpeg
diff --git a/examples/widgets/painting/basicdrawing/basicdrawing.pro b/examples/widgets/painting/basicdrawing/basicdrawing.pro
index 60b768f85a..52ee0d4402 100644
--- a/examples/widgets/painting/basicdrawing/basicdrawing.pro
+++ b/examples/widgets/painting/basicdrawing/basicdrawing.pro
@@ -7,8 +7,6 @@ RESOURCES = basicdrawing.qrc
# install
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/basicdrawing
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS basicdrawing.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/basicdrawing
-INSTALLS += target sources
+INSTALLS += target
QT += widgets
diff --git a/examples/widgets/painting/composition/composition.pro b/examples/widgets/painting/composition/composition.pro
index 05b38cee06..7ff82d789a 100644
--- a/examples/widgets/painting/composition/composition.pro
+++ b/examples/widgets/painting/composition/composition.pro
@@ -14,9 +14,7 @@ QT += widgets
# install
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/composition
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html
-sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/composition
-INSTALLS += target sources
+INSTALLS += target
win32-msvc* {
diff --git a/examples/widgets/painting/concentriccircles/concentriccircles.pro b/examples/widgets/painting/concentriccircles/concentriccircles.pro
index 1b97867752..9690465d46 100644
--- a/examples/widgets/painting/concentriccircles/concentriccircles.pro
+++ b/examples/widgets/painting/concentriccircles/concentriccircles.pro
@@ -6,9 +6,7 @@ SOURCES = circlewidget.cpp \
# install
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/concentriccircles
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS concentriccircles.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/concentriccircles
-INSTALLS += target sources
+INSTALLS += target
QT += widgets
diff --git a/examples/widgets/painting/deform/deform.pro b/examples/widgets/painting/deform/deform.pro
index eff007464d..01dc0a869c 100644
--- a/examples/widgets/painting/deform/deform.pro
+++ b/examples/widgets/painting/deform/deform.pro
@@ -15,6 +15,4 @@ QT += widgets
# install
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/deform
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/deform
-INSTALLS += target sources
+INSTALLS += target
diff --git a/examples/widgets/painting/fontsampler/fontsampler.pro b/examples/widgets/painting/fontsampler/fontsampler.pro
index 0f913b43a2..c32fc40572 100644
--- a/examples/widgets/painting/fontsampler/fontsampler.pro
+++ b/examples/widgets/painting/fontsampler/fontsampler.pro
@@ -5,9 +5,7 @@ SOURCES = main.cpp \
# install
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/fontsampler
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fontsampler.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/fontsampler
-INSTALLS += target sources
+INSTALLS += target
QT += widgets
!isEmpty(QT.printsupport.name): QT += printsupport
diff --git a/examples/widgets/painting/gradients/gradients.pro b/examples/widgets/painting/gradients/gradients.pro
index ed78e4fd2a..a7d6ae68d1 100644
--- a/examples/widgets/painting/gradients/gradients.pro
+++ b/examples/widgets/painting/gradients/gradients.pro
@@ -14,7 +14,5 @@ QT += widgets
# install
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/gradients
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/gradients
-INSTALLS += target sources
+INSTALLS += target
diff --git a/examples/widgets/painting/imagecomposition/imagecomposition.pro b/examples/widgets/painting/imagecomposition/imagecomposition.pro
index 095e1e7f2d..ce23c601f5 100644
--- a/examples/widgets/painting/imagecomposition/imagecomposition.pro
+++ b/examples/widgets/painting/imagecomposition/imagecomposition.pro
@@ -5,9 +5,7 @@ RESOURCES = imagecomposition.qrc
# install
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/imagecomposition
-sources.files = $$SOURCES $$HEADERS $$RESOURCES images *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/imagecomposition
-INSTALLS += target sources
+INSTALLS += target
QT += widgets
diff --git a/examples/widgets/painting/painterpaths/painterpaths.pro b/examples/widgets/painting/painterpaths/painterpaths.pro
index 64635be53c..560e84a267 100644
--- a/examples/widgets/painting/painterpaths/painterpaths.pro
+++ b/examples/widgets/painting/painterpaths/painterpaths.pro
@@ -7,9 +7,7 @@ unix:!mac:!vxworks:!integrity:LIBS += -lm
# install
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/painterpaths
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painterpaths.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/painterpaths
-INSTALLS += target sources
+INSTALLS += target
QT += widgets
diff --git a/examples/widgets/painting/painting.pro b/examples/widgets/painting/painting.pro
index 99cb2397ff..145fcdd383 100644
--- a/examples/widgets/painting/painting.pro
+++ b/examples/widgets/painting/painting.pro
@@ -12,12 +12,6 @@ SUBDIRS = basicdrawing \
transformations \
fontsampler
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painting.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting
-INSTALLS += target sources
-
QT += widgets
examples_affine.subdir = affine
diff --git a/examples/widgets/painting/pathstroke/pathstroke.pro b/examples/widgets/painting/pathstroke/pathstroke.pro
index 0249d5a7c3..197fe22024 100644
--- a/examples/widgets/painting/pathstroke/pathstroke.pro
+++ b/examples/widgets/painting/pathstroke/pathstroke.pro
@@ -15,7 +15,5 @@ QT += widgets
# install
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/pathstroke
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/pathstroke
-INSTALLS += target sources
+INSTALLS += target
diff --git a/examples/widgets/painting/shared/shared.pro b/examples/widgets/painting/shared/shared.pro
index db94e7aafd..2a71c7d487 100644
--- a/examples/widgets/painting/shared/shared.pro
+++ b/examples/widgets/painting/shared/shared.pro
@@ -24,11 +24,3 @@ HEADERS += \
hoverpoints.h
RESOURCES += shared.qrc
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/shared
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.pri images
-sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/shared
-INSTALLS += sources
-
-!cross_compile:INSTALLS += target
diff --git a/examples/widgets/painting/transformations/transformations.pro b/examples/widgets/painting/transformations/transformations.pro
index 3d27957a59..72f42046db 100644
--- a/examples/widgets/painting/transformations/transformations.pro
+++ b/examples/widgets/painting/transformations/transformations.pro
@@ -6,8 +6,6 @@ SOURCES = main.cpp \
# install
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/transformations
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS transformations.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/transformations
-INSTALLS += target sources
+INSTALLS += target
QT += widgets