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>

20 files changed, 40 insertions, 40 deletions

diff --git a/examples/widgets/itemviews/addressbook/addressbook.pro b/examples/widgets/itemviews/addressbook/addressbook.pro
index 32cbc4ca36..f7eafc19cb 100644
--- a/examples/widgets/itemviews/addressbook/addressbook.pro
+++ b/examples/widgets/itemviews/addressbook/addressbook.pro
@@ -11,9 +11,9 @@ HEADERS   = adddialog.h \
             tablemodel.h
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/addressbook
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/addressbook
 sources.files = $$SOURCES $$HEADERS $$RESOURCES addressbook.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/addressbook
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/addressbook
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro b/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
index 75f96e4d48..ec0b683cef 100644
--- a/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
+++ b/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
@@ -4,9 +4,9 @@ SOURCES     = main.cpp \
 CONFIG     += qt
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/basicsortfiltermodel
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/basicsortfiltermodel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/basicsortfiltermodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/basicsortfiltermodel
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/itemviews/chart/chart.pro b/examples/widgets/itemviews/chart/chart.pro
index 310bb85ad7..5aacbf92ba 100644
--- a/examples/widgets/itemviews/chart/chart.pro
+++ b/examples/widgets/itemviews/chart/chart.pro
@@ -9,9 +9,9 @@ unix:!mac:!vxworks:!integrity:LIBS+= -lm
 TARGET.EPOCHEAPSIZE = 0x200000 0x800000
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/chart
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/chart
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.cht
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/chart
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/chart
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro b/examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro
index 07e1296e06..c146aa7635 100644
--- a/examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro
+++ b/examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro
@@ -5,9 +5,9 @@ SOURCES	    = colorlisteditor.cpp \
 	      main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/coloreditorfactory
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/coloreditorfactory
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/coloreditorfactory
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/coloreditorfactory
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro b/examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro
index 9ea1fa0e25..4be203a827 100644
--- a/examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro
+++ b/examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro
@@ -3,9 +3,9 @@ SOURCES   = main.cpp \
             window.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/combowidgetmapper
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/combowidgetmapper
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/combowidgetmapper
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/combowidgetmapper
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro b/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro
index a2288b953c..fe3fc84c81 100644
--- a/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro
+++ b/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro
@@ -6,9 +6,9 @@ SOURCES     = main.cpp \
 CONFIG     += qt
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/customsortfiltermodel
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/customsortfiltermodel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/customsortfiltermodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/customsortfiltermodel
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/itemviews/dirview/dirview.pro b/examples/widgets/itemviews/dirview/dirview.pro
index 825f20c630..103fc457cb 100644
--- a/examples/widgets/itemviews/dirview/dirview.pro
+++ b/examples/widgets/itemviews/dirview/dirview.pro
@@ -1,9 +1,9 @@
 SOURCES       = main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/dirview
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/dirview
 sources.files = $$SOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/dirview
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/dirview
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro b/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro
index f86298542d..3e43837ee6 100644
--- a/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro
+++ b/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro
@@ -10,9 +10,9 @@ SOURCES     = mainwindow.cpp \
 CONFIG  += qt
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/editabletreemodel
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/editabletreemodel
 sources.files = $$FORMS $$HEADERS $$RESOURCES $$SOURCES *.pro *.txt
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/editabletreemodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/editabletreemodel
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/itemviews/fetchmore/fetchmore.pro b/examples/widgets/itemviews/fetchmore/fetchmore.pro
index 28af7e9ac0..0dd9ee6a5d 100644
--- a/examples/widgets/itemviews/fetchmore/fetchmore.pro
+++ b/examples/widgets/itemviews/fetchmore/fetchmore.pro
@@ -5,9 +5,9 @@ SOURCES   = filelistmodel.cpp \
             window.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/fetchmore
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/fetchmore
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/fetchmore
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/fetchmore
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/itemviews/frozencolumn/frozencolumn.pro b/examples/widgets/itemviews/frozencolumn/frozencolumn.pro
index 34a4a4de8c..2d9639ba22 100644
--- a/examples/widgets/itemviews/frozencolumn/frozencolumn.pro
+++ b/examples/widgets/itemviews/frozencolumn/frozencolumn.pro
@@ -3,9 +3,9 @@ SOURCES += main.cpp freezetablewidget.cpp
 RESOURCES += grades.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/frozencolumn
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/frozencolumn
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/frozencolumn
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro grades.txt
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/frozencolumn
 INSTALLS += target sources
 QT += widgets
 
diff --git a/examples/widgets/itemviews/interview/interview.pro b/examples/widgets/itemviews/interview/interview.pro
index 5cd0d1f9fc..1f8f21db50 100644
--- a/examples/widgets/itemviews/interview/interview.pro
+++ b/examples/widgets/itemviews/interview/interview.pro
@@ -11,9 +11,9 @@ build_all:!build_pass {
 }
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/interview
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/interview
 sources.files = $$SOURCES $$HEADERS $$RESOURCES README *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/interview
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/interview
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/itemviews/itemviews.pro b/examples/widgets/itemviews/itemviews.pro
index 347c259bc2..8457e88d6f 100644
--- a/examples/widgets/itemviews/itemviews.pro
+++ b/examples/widgets/itemviews/itemviews.pro
@@ -19,7 +19,7 @@ SUBDIRS       = addressbook \
 
 # install
 sources.files = README *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews
 INSTALLS += sources
 
 QT += widgets
diff --git a/examples/widgets/itemviews/pixelator/pixelator.pro b/examples/widgets/itemviews/pixelator/pixelator.pro
index 48f8a58a58..dd1ba73ac4 100644
--- a/examples/widgets/itemviews/pixelator/pixelator.pro
+++ b/examples/widgets/itemviews/pixelator/pixelator.pro
@@ -8,9 +8,9 @@ SOURCES     = imagemodel.cpp \
 RESOURCES   += images.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/pixelator
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/pixelator
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/pixelator
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/pixelator
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/itemviews/puzzle/puzzle.pro b/examples/widgets/itemviews/puzzle/puzzle.pro
index 3f76bd8fd5..3c053e30ad 100644
--- a/examples/widgets/itemviews/puzzle/puzzle.pro
+++ b/examples/widgets/itemviews/puzzle/puzzle.pro
@@ -8,9 +8,9 @@ SOURCES     = main.cpp \
               puzzlewidget.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/puzzle
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/puzzle
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/puzzle
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/puzzle
 INSTALLS += target sources
 
 
diff --git a/examples/widgets/itemviews/simpledommodel/simpledommodel.pro b/examples/widgets/itemviews/simpledommodel/simpledommodel.pro
index 2d30e71c1a..c02aeb373a 100644
--- a/examples/widgets/itemviews/simpledommodel/simpledommodel.pro
+++ b/examples/widgets/itemviews/simpledommodel/simpledommodel.pro
@@ -9,8 +9,8 @@ CONFIG  += qt
 QT      += xml widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simpledommodel
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/simpledommodel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simpledommodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/simpledommodel
 INSTALLS += target sources
 
diff --git a/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro b/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro
index cd4f8af604..7c56cdaf30 100644
--- a/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro
+++ b/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro
@@ -7,9 +7,9 @@ SOURCES     = treeitem.cpp \
 CONFIG  += qt
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simpletreemodel
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/simpletreemodel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simpletreemodel
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/simpletreemodel
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro b/examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro
index 3b2fd8b257..e8ff67d571 100644
--- a/examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro
+++ b/examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro
@@ -3,9 +3,9 @@ SOURCES   = main.cpp \
             window.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simplewidgetmapper
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/simplewidgetmapper
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simplewidgetmapper
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/simplewidgetmapper
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro b/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro
index f6416ff936..870c9d16b6 100644
--- a/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro
+++ b/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro
@@ -3,9 +3,9 @@ SOURCES     = delegate.cpp \
               main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spinboxdelegate
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/spinboxdelegate
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spinboxdelegate
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/spinboxdelegate
 INSTALLS += target sources
 
 QT += widgets
diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheet.pro b/examples/widgets/itemviews/spreadsheet/spreadsheet.pro
index 48fd07e7fd..14d6b70441 100644
--- a/examples/widgets/itemviews/spreadsheet/spreadsheet.pro
+++ b/examples/widgets/itemviews/spreadsheet/spreadsheet.pro
@@ -16,8 +16,8 @@ build_all:!build_pass {
 }
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spreadsheet
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/spreadsheet
 sources.files = $$SOURCES $$RESOURCES *.pro images $$HEADERS
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spreadsheet
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/spreadsheet
 INSTALLS += target sources
 
diff --git a/examples/widgets/itemviews/stardelegate/stardelegate.pro b/examples/widgets/itemviews/stardelegate/stardelegate.pro
index 915c26a524..56f85d876e 100644
--- a/examples/widgets/itemviews/stardelegate/stardelegate.pro
+++ b/examples/widgets/itemviews/stardelegate/stardelegate.pro
@@ -7,9 +7,9 @@ SOURCES       = main.cpp \
                 starrating.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/stardelegate
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/stardelegate
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/stardelegate
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/itemviews/stardelegate
 INSTALLS += target sources