Fix building of examples.

- Correct install path of widget examples to contain widgets
  directory in target tree.
- Add missing resources.

Task-number: QTBUG-27977

Change-Id: If4cb117998892b0b165d7678367553d3a7553b91
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

8 files changed, 21 insertions, 20 deletions

diff --git a/examples/widgets/animation/animatedtiles/animatedtiles.pro b/examples/widgets/animation/animatedtiles/animatedtiles.pro
index 1bba99449c..b25d7e65c2 100644
--- a/examples/widgets/animation/animatedtiles/animatedtiles.pro
+++ b/examples/widgets/animation/animatedtiles/animatedtiles.pro
@@ -2,9 +2,9 @@ SOURCES = main.cpp
 RESOURCES = animatedtiles.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/animatedtiles
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/animatedtiles
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS animatedtiles.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/animatedtiles
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/animatedtiles
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/animation/animation.pro b/examples/widgets/animation/animation.pro
index b17aa0e0fe..fd22891f77 100644
--- a/examples/widgets/animation/animation.pro
+++ b/examples/widgets/animation/animation.pro
@@ -10,8 +10,8 @@ SUBDIRS          += \
                  sub-attaq \
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS animation.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation
 INSTALLS += target sources
 QT += widgets
diff --git a/examples/widgets/animation/appchooser/appchooser.pro b/examples/widgets/animation/appchooser/appchooser.pro
index 158a0eca9f..868fe59f8e 100644
--- a/examples/widgets/animation/appchooser/appchooser.pro
+++ b/examples/widgets/animation/appchooser/appchooser.pro
@@ -2,9 +2,9 @@ SOURCES = main.cpp
 RESOURCES = appchooser.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/appchooser
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS appchooser.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/appchooser
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/appchooser
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS appchooser.pro *.png
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/appchooser
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/animation/easing/easing.pro b/examples/widgets/animation/easing/easing.pro
index 155d17d9b9..581103a4bf 100644
--- a/examples/widgets/animation/easing/easing.pro
+++ b/examples/widgets/animation/easing/easing.pro
@@ -8,9 +8,9 @@ FORMS   = form.ui
 RESOURCES = easing.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/easing
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/easing
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS easing.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/easing
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/easing
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/animation/moveblocks/moveblocks.pro b/examples/widgets/animation/moveblocks/moveblocks.pro
index 7c242e31e6..35693bf25d 100644
--- a/examples/widgets/animation/moveblocks/moveblocks.pro
+++ b/examples/widgets/animation/moveblocks/moveblocks.pro
@@ -1,9 +1,9 @@
 SOURCES = main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/moveblocks
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/moveblocks
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS moveblocks.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/moveblocks
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/moveblocks
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/animation/states/states.pro b/examples/widgets/animation/states/states.pro
index adf0e8d58c..1aedc68f85 100644
--- a/examples/widgets/animation/states/states.pro
+++ b/examples/widgets/animation/states/states.pro
@@ -2,9 +2,9 @@ SOURCES += main.cpp
 RESOURCES += states.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/states
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS states.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/states
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/states
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS states.pro *.png
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/states
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/animation/stickman/stickman.pro b/examples/widgets/animation/stickman/stickman.pro
index 43aaec113d..16d9b79a71 100644
--- a/examples/widgets/animation/stickman/stickman.pro
+++ b/examples/widgets/animation/stickman/stickman.pro
@@ -15,9 +15,9 @@ SOURCES += main.cpp \
 RESOURCES += stickman.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/stickman
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stickman.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/stickman
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/stickman
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stickman.pro animations
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/stickman
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/animation/sub-attaq/sub-attaq.pro b/examples/widgets/animation/sub-attaq/sub-attaq.pro
index 6d9b3195ac..0e738a5c96 100644
--- a/examples/widgets/animation/sub-attaq/sub-attaq.pro
+++ b/examples/widgets/animation/sub-attaq/sub-attaq.pro
@@ -30,13 +30,14 @@ SOURCES += boat.cpp \
 RESOURCES += subattaq.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/sub-attaq
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/sub-attaq
 sources.files = $$SOURCES \
     $$HEADERS \
     $$RESOURCES \
     $$FORMS \
     sub-attaq.pro \
-    pics
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/sub-attaq
+    pics \
+    data.xml
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/animation/sub-attaq
 INSTALLS += target \
     sources