Fix building of installed examples.

- Correct install paths
- Add missing resources.

Task-number: QTBUG-27977
Change-Id: Ie31cc31a208393dd8dfce87b067b81d986dc946e
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

13 files changed, 44 insertions, 17 deletions

diff --git a/examples/draganddrop/delayedencoding/delayedencoding.pro b/examples/draganddrop/delayedencoding/delayedencoding.pro
index bff661b..d0e6395 100644
--- a/examples/draganddrop/delayedencoding/delayedencoding.pro
+++ b/examples/draganddrop/delayedencoding/delayedencoding.pro
@@ -10,7 +10,7 @@ SOURCES     = main.cpp \
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/draganddrop/delayedencoding
 sources.files = $$SOURCES $$HEADERS *.pro $$RESOURCES images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/itemviews/delayedencoding
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/draganddrop/delayedencoding
 INSTALLS += target sources
 
 simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/draganddrop/draganddrop.pro b/examples/draganddrop/draganddrop.pro
index 99fecb0..75e3e99 100644
--- a/examples/draganddrop/draganddrop.pro
+++ b/examples/draganddrop/draganddrop.pro
@@ -1,3 +1,8 @@
 TEMPLATE = subdirs
 !contains(QT_CONFIG, no-widgets): SUBDIRS += delayedencoding
 QT+=widgets
+
+# install
+sources.files = draganddrop.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/draganddrop
+INSTALLS += sources
diff --git a/examples/embedded/desktopservices/desktopservices.pro b/examples/embedded/desktopservices/desktopservices.pro
index 9547d29..c8fc140 100644
--- a/examples/embedded/desktopservices/desktopservices.pro
+++ b/examples/embedded/desktopservices/desktopservices.pro
@@ -9,7 +9,7 @@ music.files = data/*.mp3 data/*.wav
 image.files = data/*.png
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/desktopservices
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro resources data
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/desktopservices
 
 wince*{
diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro
index 09cbcd2..07554b8 100644
--- a/examples/embedded/embedded.pro
+++ b/examples/embedded/embedded.pro
@@ -1,3 +1,8 @@
 TEMPLATE = subdirs
 !contains(QT_CONFIG, no-widgets): SUBDIRS += desktopservices fluidlauncher weatherinfo
 QT+=widgets
+
+# install
+sources.files = embedded.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded
+INSTALLS += sources
diff --git a/examples/embedded/fluidlauncher/fluidlauncher.pro b/examples/embedded/fluidlauncher/fluidlauncher.pro
index 558e052..7ea5edc 100644
--- a/examples/embedded/fluidlauncher/fluidlauncher.pro
+++ b/examples/embedded/fluidlauncher/fluidlauncher.pro
@@ -15,12 +15,11 @@ SOURCES += \
            pictureflow.cpp \
            slideshow.cpp
 
-embedded{
-    target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/fluidlauncher
-    sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html config.xml screenshots slides
-    sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/fluidlauncher
-    INSTALLS += target sources
-}
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/fluidlauncher
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html config.xml screenshots slides
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/fluidlauncher
+INSTALLS += target sources
 
 wince*{
     QT += svg
diff --git a/examples/embedded/weatherinfo/weatherinfo.pro b/examples/embedded/weatherinfo/weatherinfo.pro
index 4ff9a73..4bed5d0 100644
--- a/examples/embedded/weatherinfo/weatherinfo.pro
+++ b/examples/embedded/weatherinfo/weatherinfo.pro
@@ -5,7 +5,7 @@ RESOURCES = weatherinfo.qrc
 QT += network svg
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/weatherinfo
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro icons
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/weatherinfo
 INSTALLS += target sources
 QT+=widgets
diff --git a/examples/network/network.pro b/examples/network/network.pro
index 6cf6c42..0a65e40 100644
--- a/examples/network/network.pro
+++ b/examples/network/network.pro
@@ -1,3 +1,8 @@
 TEMPLATE = subdirs
 !contains(QT_CONFIG, no-widgets): SUBDIRS += bearercloud
 QT+=widgets
+
+# install
+sources.files = network.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/network
+INSTALLS += sources
diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro
index fd845b6..6f3d007 100644
--- a/examples/opengl/opengl.pro
+++ b/examples/opengl/opengl.pro
@@ -1,3 +1,8 @@
 TEMPLATE = subdirs
 !contains(QT_CONFIG, no-widgets): SUBDIRS += framebufferobject
 QT+=widgets
+
+# install
+sources.files = opengl.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/opengl
+INSTALLS += sources
diff --git a/examples/richtext/richtext.pro b/examples/richtext/richtext.pro
index be9c6c3..4262d78 100644
--- a/examples/richtext/richtext.pro
+++ b/examples/richtext/richtext.pro
@@ -1,3 +1,8 @@
 TEMPLATE = subdirs
 !contains(QT_CONFIG, no-widgets): SUBDIRS += textobject
 QT+=widgets
+
+# install
+sources.files = richtext.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/richtext
+INSTALLS += sources
diff --git a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro
index c48a317..2445f96 100644
--- a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro
+++ b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro
@@ -5,9 +5,9 @@ HEADERS += embeddedsvgviewer.h
 SOURCES += embeddedsvgviewer.cpp main.cpp
 RESOURCES += embeddedsvgviewer.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/embeddedsvgviewer
+target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/embeddedsvgviewer
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.svg files
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/embeddedsvgviewer
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/embeddedsvgviewer
 INSTALLS += target sources
 
 wince* {
diff --git a/examples/svg/svg.pro b/examples/svg/svg.pro
index 1652275..fdadc81 100644
--- a/examples/svg/svg.pro
+++ b/examples/svg/svg.pro
@@ -4,4 +4,7 @@ TEMPLATE = subdirs
 
 QT+=widgets
 
-
+# install
+sources.files = svg.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg
+INSTALLS += sources
diff --git a/examples/svg/svggenerator/svggenerator.pro b/examples/svg/svggenerator/svggenerator.pro
index 4e62b22..6945418 100644
--- a/examples/svg/svggenerator/svggenerator.pro
+++ b/examples/svg/svggenerator/svggenerator.pro
@@ -11,9 +11,9 @@ QT += svg
 INCLUDEPATH += $$PWD
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/painting/svggenerator
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS svggenerator.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/painting/svggenerator
+target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svggenerator
+sources.files = $$SOURCES $$HEADERS $$RESOURCES forms doc resources svggenerator.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svggenerator
 INSTALLS += target sources
 
 QT+=widgets
diff --git a/examples/svg/svgviewer/svgviewer.pro b/examples/svg/svgviewer/svgviewer.pro
index 94daed9..9614741 100644
--- a/examples/svg/svgviewer/svgviewer.pro
+++ b/examples/svg/svgviewer/svgviewer.pro
@@ -11,9 +11,9 @@ contains(QT_CONFIG, opengl): QT += opengl
 CONFIG += console
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/painting/svgviewer
+target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svgviewer
 sources.files = $$SOURCES $$HEADERS $$RESOURCES svgviewer.pro files
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/painting/svgviewer
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svgviewer
 INSTALLS += target sources
 
 wince*: {