From 2ac3f92296d16432f2ed3af916271d6848547f36 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Fri, 14 Dec 2012 21:13:33 +0100
Subject: 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>
---
 examples/widgets/mainwindows/application/application.pro | 4 ++--
 examples/widgets/mainwindows/dockwidgets/dockwidgets.pro | 6 +++---
 examples/widgets/mainwindows/mainwindow/mainwindow.pro   | 4 ++--
 examples/widgets/mainwindows/mdi/mdi.pro                 | 4 ++--
 examples/widgets/mainwindows/menus/menus.pro             | 4 ++--
 examples/widgets/mainwindows/recentfiles/recentfiles.pro | 4 ++--
 examples/widgets/mainwindows/sdi/sdi.pro                 | 4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'examples/widgets/mainwindows')

diff --git a/examples/widgets/mainwindows/application/application.pro b/examples/widgets/mainwindows/application/application.pro
index f202a60979..652cc73485 100644
--- a/examples/widgets/mainwindows/application/application.pro
+++ b/examples/widgets/mainwindows/application/application.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS       = mainwindow.h
 SOURCES       = main.cpp \
                 mainwindow.cpp
@@ -9,6 +11,4 @@ RESOURCES     = application.qrc
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/application
 INSTALLS += target
 
-QT += widgets
-
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro b/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro
index ec3a5813e1..4bccf49399 100644
--- a/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro
+++ b/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro
@@ -1,3 +1,6 @@
+QT += widgets
+!isEmpty(QT.printsupport.name): QT += printsupport
+
 HEADERS         = mainwindow.h
 SOURCES         = main.cpp \
                   mainwindow.cpp
@@ -7,7 +10,4 @@ RESOURCES       = dockwidgets.qrc
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/dockwidgets
 INSTALLS += target
 
-QT += widgets
-!isEmpty(QT.printsupport.name): QT += printsupport
-
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/mainwindows/mainwindow/mainwindow.pro b/examples/widgets/mainwindows/mainwindow/mainwindow.pro
index 2bef5f0b71..bf92d0e3ca 100644
--- a/examples/widgets/mainwindows/mainwindow/mainwindow.pro
+++ b/examples/widgets/mainwindows/mainwindow/mainwindow.pro
@@ -1,4 +1,6 @@
 TEMPLATE = app
+QT += widgets
+
 HEADERS += colorswatch.h mainwindow.h toolbar.h
 SOURCES += colorswatch.cpp mainwindow.cpp toolbar.cpp main.cpp
 build_all:!build_pass {
@@ -11,5 +13,3 @@ RESOURCES += mainwindow.qrc
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/mainwindow
 INSTALLS += target
-
-QT += widgets
diff --git a/examples/widgets/mainwindows/mdi/mdi.pro b/examples/widgets/mainwindows/mdi/mdi.pro
index 786bbd3569..9f8ed1184a 100644
--- a/examples/widgets/mainwindows/mdi/mdi.pro
+++ b/examples/widgets/mainwindows/mdi/mdi.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS       = mainwindow.h \
                 mdichild.h
 SOURCES       = main.cpp \
@@ -9,6 +11,4 @@ RESOURCES     = mdi.qrc
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/mdi
 INSTALLS += target
 
-QT += widgets
-
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/mainwindows/menus/menus.pro b/examples/widgets/mainwindows/menus/menus.pro
index 1ac5df4a3b..9be318759c 100644
--- a/examples/widgets/mainwindows/menus/menus.pro
+++ b/examples/widgets/mainwindows/menus/menus.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS       = mainwindow.h
 SOURCES       = mainwindow.cpp \
                 main.cpp
@@ -5,5 +7,3 @@ SOURCES       = mainwindow.cpp \
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/menus
 INSTALLS += target
-
-QT += widgets
diff --git a/examples/widgets/mainwindows/recentfiles/recentfiles.pro b/examples/widgets/mainwindows/recentfiles/recentfiles.pro
index 4ab5a6820e..898ebd7842 100644
--- a/examples/widgets/mainwindows/recentfiles/recentfiles.pro
+++ b/examples/widgets/mainwindows/recentfiles/recentfiles.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS       = mainwindow.h
 SOURCES       = main.cpp \
                 mainwindow.cpp
@@ -6,6 +8,4 @@ SOURCES       = main.cpp \
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/recentfiles
 INSTALLS += target
 
-QT += widgets
-
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/mainwindows/sdi/sdi.pro b/examples/widgets/mainwindows/sdi/sdi.pro
index 30ae4f5f3d..7d46b327e7 100644
--- a/examples/widgets/mainwindows/sdi/sdi.pro
+++ b/examples/widgets/mainwindows/sdi/sdi.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS       = mainwindow.h
 SOURCES       = main.cpp \
                 mainwindow.cpp
@@ -7,6 +9,4 @@ RESOURCES     = sdi.qrc
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/sdi
 INSTALLS += target
 
-QT += widgets
-
 simulator: warning(This example might not fully work on Simulator platform)
-- 
cgit v1.2.3