clean up example project files, mostly wrt QT+=widgets

move QT+=widgets (and printsupport) statements before the install
statements, and de-duplicate some cases.
also move some TARGET assignments to a more conventional place.

Change-Id: I6140d8611680f66c24490e5894e4eb90cae95635
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

17 files changed, 34 insertions, 36 deletions

diff --git a/examples/widgets/itemviews/addressbook/addressbook.pro b/examples/widgets/itemviews/addressbook/addressbook.pro
index 0d421cb3e3..5e2f1bcbbc 100644
--- a/examples/widgets/itemviews/addressbook/addressbook.pro
+++ b/examples/widgets/itemviews/addressbook/addressbook.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 SOURCES   = adddialog.cpp \
             addresswidget.cpp \
             main.cpp \
@@ -13,5 +15,3 @@ HEADERS   = adddialog.h \
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/addressbook
 INSTALLS += target
-QT += widgets
-
diff --git a/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro b/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
index 7390cec23f..2469a4ef20 100644
--- a/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
+++ b/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS     = window.h
 SOURCES     = main.cpp \
               window.cpp
@@ -5,5 +7,3 @@ SOURCES     = main.cpp \
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/basicsortfiltermodel
 INSTALLS += target
-
-QT += widgets
diff --git a/examples/widgets/itemviews/chart/chart.pro b/examples/widgets/itemviews/chart/chart.pro
index 927c469e88..caa28276bc 100644
--- a/examples/widgets/itemviews/chart/chart.pro
+++ b/examples/widgets/itemviews/chart/chart.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS     = mainwindow.h \
               pieview.h
 RESOURCES   = chart.qrc
@@ -9,6 +11,3 @@ unix:!mac:!vxworks:!integrity:LIBS+= -lm
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/chart
 INSTALLS += target
-
-QT += widgets
-
diff --git a/examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro b/examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro
index 4c16a6fbc1..82cb264ddd 100644
--- a/examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro
+++ b/examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS	    = colorlisteditor.h \
 	      window.h
 SOURCES	    = colorlisteditor.cpp \
@@ -7,6 +9,3 @@ SOURCES	    = colorlisteditor.cpp \
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/coloreditorfactory
 INSTALLS += target
-
-QT += widgets
-
diff --git a/examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro b/examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro
index a093f88e88..37f82fa5ae 100644
--- a/examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro
+++ b/examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS   = window.h
 SOURCES   = main.cpp \
             window.cpp
@@ -5,5 +7,4 @@ SOURCES   = main.cpp \
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/combowidgetmapper
 INSTALLS += target
-QT += widgets
 
diff --git a/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro b/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro
index 488a755b9d..b722e606d3 100644
--- a/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro
+++ b/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS     = mysortfilterproxymodel.h \
               window.h
 SOURCES     = main.cpp \
@@ -7,5 +9,3 @@ SOURCES     = main.cpp \
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/customsortfiltermodel
 INSTALLS += target
-
-QT += widgets
diff --git a/examples/widgets/itemviews/dirview/dirview.pro b/examples/widgets/itemviews/dirview/dirview.pro
index 0c1cd92a58..511ec0ed98 100644
--- a/examples/widgets/itemviews/dirview/dirview.pro
+++ b/examples/widgets/itemviews/dirview/dirview.pro
@@ -1,7 +1,7 @@
+QT += widgets
+
 SOURCES       = main.cpp
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/dirview
 INSTALLS += target
-
-QT += widgets
diff --git a/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro b/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro
index a83b6fc5bf..a6c1e5563f 100644
--- a/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro
+++ b/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 FORMS       = mainwindow.ui
 HEADERS     = mainwindow.h \
               treeitem.h \
@@ -11,5 +13,3 @@ SOURCES     = mainwindow.cpp \
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/editabletreemodel
 INSTALLS += target
-
-QT += widgets
diff --git a/examples/widgets/itemviews/fetchmore/fetchmore.pro b/examples/widgets/itemviews/fetchmore/fetchmore.pro
index 67006de9c7..eb4275da19 100644
--- a/examples/widgets/itemviews/fetchmore/fetchmore.pro
+++ b/examples/widgets/itemviews/fetchmore/fetchmore.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS   = filelistmodel.h \
             window.h
 SOURCES   = filelistmodel.cpp \
@@ -7,5 +9,3 @@ SOURCES   = filelistmodel.cpp \
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/fetchmore
 INSTALLS += target
-
-QT += widgets
diff --git a/examples/widgets/itemviews/frozencolumn/frozencolumn.pro b/examples/widgets/itemviews/frozencolumn/frozencolumn.pro
index 00247b71c7..717ba40a9d 100644
--- a/examples/widgets/itemviews/frozencolumn/frozencolumn.pro
+++ b/examples/widgets/itemviews/frozencolumn/frozencolumn.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS += freezetablewidget.h
 SOURCES += main.cpp freezetablewidget.cpp
 RESOURCES += grades.qrc
@@ -5,5 +7,4 @@ RESOURCES += grades.qrc
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/frozencolumn
 INSTALLS += target
-QT += widgets
 
diff --git a/examples/widgets/itemviews/interview/interview.pro b/examples/widgets/itemviews/interview/interview.pro
index a61d77613c..0e480e939c 100644
--- a/examples/widgets/itemviews/interview/interview.pro
+++ b/examples/widgets/itemviews/interview/interview.pro
@@ -1,4 +1,5 @@
 TEMPLATE = app
+QT += widgets
 
 HEADERS += model.h
 SOURCES += model.cpp main.cpp
@@ -12,5 +13,3 @@ build_all:!build_pass {
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/interview
 INSTALLS += target
-
-QT += widgets
diff --git a/examples/widgets/itemviews/pixelator/pixelator.pro b/examples/widgets/itemviews/pixelator/pixelator.pro
index 37e54f937a..b844e7c3a4 100644
--- a/examples/widgets/itemviews/pixelator/pixelator.pro
+++ b/examples/widgets/itemviews/pixelator/pixelator.pro
@@ -1,3 +1,6 @@
+QT += widgets
+!isEmpty(QT.printsupport.name): QT += printsupport
+
 HEADERS     = imagemodel.h \
               mainwindow.h \
               pixeldelegate.h
@@ -10,6 +13,3 @@ RESOURCES   += images.qrc
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/pixelator
 INSTALLS += target
-
-QT += widgets
-!isEmpty(QT.printsupport.name): QT += printsupport
diff --git a/examples/widgets/itemviews/puzzle/puzzle.pro b/examples/widgets/itemviews/puzzle/puzzle.pro
index a05ad83f79..a5379293ff 100644
--- a/examples/widgets/itemviews/puzzle/puzzle.pro
+++ b/examples/widgets/itemviews/puzzle/puzzle.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS     = mainwindow.h \
               piecesmodel.h \
               puzzlewidget.h
@@ -15,6 +17,3 @@ INSTALLS += target
 wince* {
    DEPLOYMENT_PLUGIN += qjpeg qgif
 }
-
-QT += widgets
-
diff --git a/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro b/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro
index 674b8e8c68..82484c9971 100644
--- a/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro
+++ b/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS     = treeitem.h \
               treemodel.h
 RESOURCES   = simpletreemodel.qrc
@@ -8,5 +10,3 @@ SOURCES     = treeitem.cpp \
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/simpletreemodel
 INSTALLS += target
-
-QT += widgets
diff --git a/examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro b/examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro
index c19cb0eef8..1d5cca3f01 100644
--- a/examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro
+++ b/examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS   = window.h
 SOURCES   = main.cpp \
             window.cpp
@@ -5,5 +7,3 @@ SOURCES   = main.cpp \
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/simplewidgetmapper
 INSTALLS += target
-
-QT += widgets
diff --git a/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro b/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro
index c156a4f425..92f6b9d712 100644
--- a/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro
+++ b/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS     = delegate.h
 SOURCES     = delegate.cpp \
               main.cpp
@@ -6,6 +8,4 @@ SOURCES     = delegate.cpp \
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/spinboxdelegate
 INSTALLS += target
 
-QT += widgets
-
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/itemviews/stardelegate/stardelegate.pro b/examples/widgets/itemviews/stardelegate/stardelegate.pro
index 13c260d268..fefb8b5b95 100644
--- a/examples/widgets/itemviews/stardelegate/stardelegate.pro
+++ b/examples/widgets/itemviews/stardelegate/stardelegate.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS       = stardelegate.h \
                 stareditor.h \
                 starrating.h
@@ -10,6 +12,4 @@ SOURCES       = main.cpp \
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/stardelegate
 INSTALLS += target
 
-
-QT += widgets
 simulator: warning(This example might not fully work on Simulator platform)