clean up qmake-generated projects

remove "header" and assignmets which are defaults or bogus,
reorder some assignments.

Change-Id: I67403872168c890ca3b696753ceb01c605d19be7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

20 files changed, 5 insertions, 141 deletions

diff --git a/tests/manual/gestures/graphicsview/graphicsview.pro b/tests/manual/gestures/graphicsview/graphicsview.pro
index a40c323eb3..c5f6fe0764 100644
--- a/tests/manual/gestures/graphicsview/graphicsview.pro
+++ b/tests/manual/gestures/graphicsview/graphicsview.pro
@@ -1,12 +1,3 @@
-# #####################################################################
-# Automatically generated by qmake (2.01a) Mon Sep 7 13:26:43 2009
-# #####################################################################
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
 SOURCES += main.cpp \
     imageitem.cpp \
     gestures.cpp \
diff --git a/tests/manual/lance/lance.pro b/tests/manual/lance/lance.pro
index 7eee7ec2de..e24d3f2fa3 100644
--- a/tests/manual/lance/lance.pro
+++ b/tests/manual/lance/lance.pro
@@ -4,7 +4,6 @@ TEMPLATE = app
 INCLUDEPATH += . $$LANCELOT_DIR
 QT += core-private gui-private
 
-# Input
 HEADERS += widgets.h \
            interactivewidget.h \
            $$LANCELOT_DIR/paintcommands.h
diff --git a/tests/manual/qgraphicslayout/flicker/flicker.pro b/tests/manual/qgraphicslayout/flicker/flicker.pro
index 323a30f7bf..2e09826022 100644
--- a/tests/manual/qgraphicslayout/flicker/flicker.pro
+++ b/tests/manual/qgraphicslayout/flicker/flicker.pro
@@ -1,8 +1,2 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
 HEADERS += window.h
 SOURCES += main.cpp window.cpp
diff --git a/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro
index d73124c8f9..fd21007793 100644
--- a/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro
+++ b/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro
@@ -1,13 +1,10 @@
 CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_qhttpnetworkconnection
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT -= gui
 QT += network testlib
 
 CONFIG += release
 
-# Input
 SOURCES += main.cpp
diff --git a/tests/manual/qimagereader/qimagereader.pro b/tests/manual/qimagereader/qimagereader.pro
index b8293b9552..28dcadcbfa 100644
--- a/tests/manual/qimagereader/qimagereader.pro
+++ b/tests/manual/qimagereader/qimagereader.pro
@@ -1,8 +1 @@
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
 SOURCES += main.cpp
diff --git a/tests/manual/qlocale/qlocale.pro b/tests/manual/qlocale/qlocale.pro
index e9f17f4f9f..4eaddedcf0 100644
--- a/tests/manual/qlocale/qlocale.pro
+++ b/tests/manual/qlocale/qlocale.pro
@@ -1,8 +1,2 @@
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
 HEADERS += currency.h calendar.h dateformats.h numberformats.h languages.h window.h miscellaneous.h info.h
 SOURCES += currency.cpp main.cpp calendar.cpp dateformats.cpp numberformats.cpp languages.cpp window.cpp miscellaneous.cpp info.cpp
diff --git a/tests/manual/qnetworkaccessmanager/qget/qget.pro b/tests/manual/qnetworkaccessmanager/qget/qget.pro
index 341f772b51..1f2b497171 100644
--- a/tests/manual/qnetworkaccessmanager/qget/qget.pro
+++ b/tests/manual/qnetworkaccessmanager/qget/qget.pro
@@ -2,6 +2,5 @@ TEMPLATE = app
 QT = core network
 CONFIG += console
 
-# Input
 SOURCES += qget.cpp
 HEADERS += qget.h
diff --git a/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro b/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
index 613fcd85e4..7ad271ce46 100644
--- a/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
+++ b/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
@@ -1,13 +1,10 @@
 CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_qnetworkconfigurationmanager
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT -= gui
 QT += network testlib
 
 CONFIG += release
 
-# Input
 SOURCES += main.cpp
diff --git a/tests/manual/qnetworkreply/qnetworkreply.pro b/tests/manual/qnetworkreply/qnetworkreply.pro
index 479a1e63bc..17f48c6544 100644
--- a/tests/manual/qnetworkreply/qnetworkreply.pro
+++ b/tests/manual/qnetworkreply/qnetworkreply.pro
@@ -1,13 +1,10 @@
 CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_qnetworkreply
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT -= gui
 QT += network testlib
 
 CONFIG += release
 
-# Input
 SOURCES += main.cpp
diff --git a/tests/manual/qtabletevent/device_information/qtabletevent.pro b/tests/manual/qtabletevent/device_information/qtabletevent.pro
index e0ed549004..8251d73094 100644
--- a/tests/manual/qtabletevent/device_information/qtabletevent.pro
+++ b/tests/manual/qtabletevent/device_information/qtabletevent.pro
@@ -1,13 +1,5 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Mon Aug 10 17:02:09 2009
-######################################################################
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += main.cpp\
+SOURCES += \
+    main.cpp \
     tabletwidget.cpp
-HEADERS += tabletwidget.h
+HEADERS += \
+    tabletwidget.h
diff --git a/tests/manual/qtabletevent/event_compression/event_compression.pro b/tests/manual/qtabletevent/event_compression/event_compression.pro
index 273fd6c1b0..fd2521e44f 100644
--- a/tests/manual/qtabletevent/event_compression/event_compression.pro
+++ b/tests/manual/qtabletevent/event_compression/event_compression.pro
@@ -1,7 +1,5 @@
-TEMPLATE = app
 QT += testlib
 
-# Input
 SOURCES += main.cpp \
     mousestatwidget.cpp
 HEADERS += mousestatwidget.h
diff --git a/tests/manual/qwidget_zorder/qwidget_zorder.pro b/tests/manual/qwidget_zorder/qwidget_zorder.pro
index 5526f9161f..28dcadcbfa 100644
--- a/tests/manual/qwidget_zorder/qwidget_zorder.pro
+++ b/tests/manual/qwidget_zorder/qwidget_zorder.pro
@@ -1,6 +1 @@
-TEMPLATE = app
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
 SOURCES += main.cpp
diff --git a/tests/manual/repaint/mainwindow/mainwindow.pro b/tests/manual/repaint/mainwindow/mainwindow.pro
index c269d57eff..db6b2d280c 100644
--- a/tests/manual/repaint/mainwindow/mainwindow.pro
+++ b/tests/manual/repaint/mainwindow/mainwindow.pro
@@ -1,15 +1,2 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Wed Nov 8 15:46:28 2006
-######################################################################
-
-TEMPLATE = app
-TARGET = mainwindow
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
 HEADERS += ../shared/shared.h
 SOURCES += main.cpp
-CONFIG += qt warn_on debug  create_prl link_prl
-OBJECTS_DIR = .obj/debug-shared
-MOC_DIR = .moc/debug-shared
diff --git a/tests/manual/repaint/scrollarea/scrollarea.pro b/tests/manual/repaint/scrollarea/scrollarea.pro
index e1a40ad6ad..db6b2d280c 100644
--- a/tests/manual/repaint/scrollarea/scrollarea.pro
+++ b/tests/manual/repaint/scrollarea/scrollarea.pro
@@ -1,15 +1,2 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Wed Nov 8 15:28:57 2006
-######################################################################
-
-TEMPLATE = app
-TARGET = scrollarea
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
 HEADERS += ../shared/shared.h
 SOURCES += main.cpp
-CONFIG += qt warn_on debug  create_prl link_prl
-OBJECTS_DIR = .obj/debug-shared
-MOC_DIR = .moc/debug-shared
diff --git a/tests/manual/repaint/splitter/splitter.pro b/tests/manual/repaint/splitter/splitter.pro
index 0afc0630ba..db6b2d280c 100644
--- a/tests/manual/repaint/splitter/splitter.pro
+++ b/tests/manual/repaint/splitter/splitter.pro
@@ -1,15 +1,2 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Wed Nov 8 15:39:53 2006
-######################################################################
-
-TEMPLATE = app
-TARGET = splitter
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
 HEADERS += ../shared/shared.h
 SOURCES += main.cpp
-CONFIG += qt warn_on debug  create_prl link_prl
-OBJECTS_DIR = .obj/debug-shared
-MOC_DIR = .moc/debug-shared
diff --git a/tests/manual/repaint/tableview/tableview.pro b/tests/manual/repaint/tableview/tableview.pro
index 4fccf4abc9..4097c95739 100644
--- a/tests/manual/repaint/tableview/tableview.pro
+++ b/tests/manual/repaint/tableview/tableview.pro
@@ -1,8 +1,2 @@
 HEADERS +=../shared/shared.h
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
 SOURCES += main.cpp
diff --git a/tests/manual/repaint/task141091/task141091.pro b/tests/manual/repaint/task141091/task141091.pro
index db89bd35b8..82ead4b6c2 100644
--- a/tests/manual/repaint/task141091/task141091.pro
+++ b/tests/manual/repaint/task141091/task141091.pro
@@ -1,12 +1,3 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Tue Mar 6 13:44:00 2007
-######################################################################
+CONFIG += console
 
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-CONFIG+=console
-
-# Input
 SOURCES += main.cpp
diff --git a/tests/manual/repaint/toplevel/toplevel.pro b/tests/manual/repaint/toplevel/toplevel.pro
index 568ea8e062..c2cc19f67d 100644
--- a/tests/manual/repaint/toplevel/toplevel.pro
+++ b/tests/manual/repaint/toplevel/toplevel.pro
@@ -1,16 +1,4 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Tue Nov 7 10:15:42 2006
-######################################################################
-
-TEMPLATE = app
-TARGET = toplevel
-DEPENDPATH += .
-INCLUDEPATH += .
 CONFIG += console
 
-# Input
 HEADERS += ../shared/shared.h
 SOURCES += main.cpp
-CONFIG += qt warn_on debug  create_prl link_prl
-OBJECTS_DIR = .obj/debug-shared
-MOC_DIR = .moc/debug-shared
diff --git a/tests/manual/repaint/widget/widget.pro b/tests/manual/repaint/widget/widget.pro
index c9d8f872e8..db6b2d280c 100644
--- a/tests/manual/repaint/widget/widget.pro
+++ b/tests/manual/repaint/widget/widget.pro
@@ -1,15 +1,2 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Tue Nov 7 11:16:05 2006
-######################################################################
-
-TEMPLATE = app
-TARGET = widget
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
 HEADERS += ../shared/shared.h
 SOURCES += main.cpp
-CONFIG += qt warn_on debug  create_prl link_prl
-OBJECTS_DIR = .obj/debug-shared
-MOC_DIR = .moc/debug-shared
diff --git a/tests/manual/socketengine/socketengine.pro b/tests/manual/socketengine/socketengine.pro
index 24523e9ca4..808502c22a 100644
--- a/tests/manual/socketengine/socketengine.pro
+++ b/tests/manual/socketengine/socketengine.pro
@@ -1,13 +1,10 @@
 CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_socketengine
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT -= gui
 QT += network testlib
 
 CONFIG += release
 
-# Input
 SOURCES += main.cpp