From aeb036ed8715d0c099d3dca87f7def4dbaf8e9b4 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Tue, 27 Nov 2012 20:40:16 +0100
Subject: 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>
---
 examples/qtconcurrent/imagescaling/imagescaling.pro     | 4 +---
 examples/qtconcurrent/map/map.pro                       | 4 +---
 examples/qtconcurrent/progressdialog/progressdialog.pro | 4 +---
 examples/qtconcurrent/qtconcurrent.pro                  | 6 ------
 examples/qtconcurrent/runfunction/runfunction.pro       | 4 +---
 examples/qtconcurrent/wordcount/wordcount.pro           | 4 +---
 6 files changed, 5 insertions(+), 21 deletions(-)

(limited to 'examples/qtconcurrent')

diff --git a/examples/qtconcurrent/imagescaling/imagescaling.pro b/examples/qtconcurrent/imagescaling/imagescaling.pro
index 145764bfa0..e41bcc65e8 100644
--- a/examples/qtconcurrent/imagescaling/imagescaling.pro
+++ b/examples/qtconcurrent/imagescaling/imagescaling.pro
@@ -4,9 +4,7 @@ SOURCES += main.cpp imagescaling.cpp
 HEADERS += imagescaling.h
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/imagescaling
-sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/imagescaling
-INSTALLS += target sources
+INSTALLS += target
 
 wince*: DEPLOYMENT_PLUGIN += qgif qjpeg
 
diff --git a/examples/qtconcurrent/map/map.pro b/examples/qtconcurrent/map/map.pro
index 62d40d0f17..17022380d7 100644
--- a/examples/qtconcurrent/map/map.pro
+++ b/examples/qtconcurrent/map/map.pro
@@ -7,8 +7,6 @@ CONFIG -= app_bundle
 SOURCES += main.cpp
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/map
-sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/map
-INSTALLS += target sources
+INSTALLS += target
 
 simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qtconcurrent/progressdialog/progressdialog.pro b/examples/qtconcurrent/progressdialog/progressdialog.pro
index 4789adf41f..c1b7e17dff 100644
--- a/examples/qtconcurrent/progressdialog/progressdialog.pro
+++ b/examples/qtconcurrent/progressdialog/progressdialog.pro
@@ -4,8 +4,6 @@ CONFIG += console
 SOURCES += main.cpp
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/progressdialog
-sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/progressdialog
-INSTALLS += target sources
+INSTALLS += target
 
 simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro
index 58a5576568..72220b1ab3 100644
--- a/examples/qtconcurrent/qtconcurrent.pro
+++ b/examples/qtconcurrent/qtconcurrent.pro
@@ -15,9 +15,3 @@ contains(QT_CONFIG, no-widgets) {
         runfunction \
         wordcount
 }
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtconcurrent.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent
-INSTALLS += target sources
diff --git a/examples/qtconcurrent/runfunction/runfunction.pro b/examples/qtconcurrent/runfunction/runfunction.pro
index a73b56e857..d8820e20f7 100644
--- a/examples/qtconcurrent/runfunction/runfunction.pro
+++ b/examples/qtconcurrent/runfunction/runfunction.pro
@@ -5,8 +5,6 @@ CONFIG -= app_bundle
 SOURCES += main.cpp
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/runfunction
-sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/runfunction
-INSTALLS += target sources
+INSTALLS += target
 
 simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qtconcurrent/wordcount/wordcount.pro b/examples/qtconcurrent/wordcount/wordcount.pro
index acb3d5454e..8b8285c4c0 100644
--- a/examples/qtconcurrent/wordcount/wordcount.pro
+++ b/examples/qtconcurrent/wordcount/wordcount.pro
@@ -5,8 +5,6 @@ CONFIG -= app_bundle
 SOURCES += main.cpp
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/wordcount
-sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/wordcount
-INSTALLS += target sources
+INSTALLS += target
 
 simulator: warning(This example does not work on Simulator platform)
-- 
cgit v1.2.3