From d91cf1e53b450483d92c50965fd3c33ab1da4300 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 21 Feb 2012 16:09:30 +0100
Subject: 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>
---
 tests/auto/widgets/dialogs/qerrormessage/qerrormessage.pro  |  3 ---
 tests/auto/widgets/dialogs/qmessagebox/qmessagebox.pro      |  5 +----
 .../desktopsettingsaware/desktopsettingsaware.pro           | 13 ++-----------
 tests/auto/widgets/styles/qstyleoption/qstyleoption.pro     | 11 +++--------
 .../widgets/styles/qstylesheetstyle/qstylesheetstyle.pro    |  6 +++---
 tests/auto/widgets/util/qcompleter/qcompleter.pro           |  3 ---
 6 files changed, 9 insertions(+), 32 deletions(-)

(limited to 'tests/auto/widgets')

diff --git a/tests/auto/widgets/dialogs/qerrormessage/qerrormessage.pro b/tests/auto/widgets/dialogs/qerrormessage/qerrormessage.pro
index 730932d83d..b4cf05e347 100644
--- a/tests/auto/widgets/dialogs/qerrormessage/qerrormessage.pro
+++ b/tests/auto/widgets/dialogs/qerrormessage/qerrormessage.pro
@@ -1,10 +1,7 @@
 CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_qerrormessage
-DEPENDPATH += .
-INCLUDEPATH += . 
 
 QT += widgets testlib
 
-# Input
 SOURCES += tst_qerrormessage.cpp
diff --git a/tests/auto/widgets/dialogs/qmessagebox/qmessagebox.pro b/tests/auto/widgets/dialogs/qmessagebox/qmessagebox.pro
index 5b8f796485..91848fee24 100644
--- a/tests/auto/widgets/dialogs/qmessagebox/qmessagebox.pro
+++ b/tests/auto/widgets/dialogs/qmessagebox/qmessagebox.pro
@@ -1,9 +1,6 @@
-CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_qmessagebox
 QT += gui-private core-private widgets testlib
-DEPENDPATH += .
-INCLUDEPATH += . 
+CONFIG += testcase
 
-# Input
 SOURCES += tst_qmessagebox.cpp 
diff --git a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro
index 3b229e31cb..97768eac74 100644
--- a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro
+++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro
@@ -1,15 +1,6 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Mon Jul 11 11:30:34 2005
-######################################################################
+QT += widgets
+CONFIG -= app_bundle
 
-TEMPLATE = app
-DEPENDPATH += .
-INCLUDEPATH += .
 DESTDIR = ./
 
-# Input
-QT += widgets
 SOURCES += main.cpp
-CONFIG += qt warn_on create_prl link_prl
-CONFIG -= app_bundle
-
diff --git a/tests/auto/widgets/styles/qstyleoption/qstyleoption.pro b/tests/auto/widgets/styles/qstyleoption/qstyleoption.pro
index cadc6d6ddc..bf12a6b30f 100644
--- a/tests/auto/widgets/styles/qstyleoption/qstyleoption.pro
+++ b/tests/auto/widgets/styles/qstyleoption/qstyleoption.pro
@@ -1,12 +1,7 @@
-######################################################################
-# Automatically generated by qmake (2.00a) ti 8. mar 16:20:21 2005
-######################################################################
+TEMPLATE = app
+TARGET = tst_qstyleoption
 
 CONFIG += testcase
-TARGET = tst_qstyleoption
-TEMPLATE = app
 QT += widgets testlib
-# Input
-SOURCES += tst_qstyleoption.cpp
-
 
+SOURCES += tst_qstyleoption.cpp
diff --git a/tests/auto/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro b/tests/auto/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro
index f908c3ab7d..dd17183b30 100644
--- a/tests/auto/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro
+++ b/tests/auto/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro
@@ -1,10 +1,10 @@
 CONFIG += testcase
 TARGET = tst_qstylesheetstyle
-QT += widgets widgets-private testlib
-QT += gui-private
-# Input
+QT += widgets widgets-private gui-private testlib
+
 SOURCES += tst_qstylesheetstyle.cpp
 RESOURCES += resources.qrc
+
 requires(contains(QT_CONFIG,private_tests))
 
 win32:CONFIG += insignificant_test # QTBUG-24323
diff --git a/tests/auto/widgets/util/qcompleter/qcompleter.pro b/tests/auto/widgets/util/qcompleter/qcompleter.pro
index 63b137eb7c..6a817a89ac 100644
--- a/tests/auto/widgets/util/qcompleter/qcompleter.pro
+++ b/tests/auto/widgets/util/qcompleter/qcompleter.pro
@@ -2,10 +2,7 @@ CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_qcompleter
 QT += widgets testlib
-DEPENDPATH += .
-INCLUDEPATH += . ..
 
-# Input
 SOURCES += tst_qcompleter.cpp
 
 CONFIG += insignificant_test # QTBUG-21424
-- 
cgit v1.2.3