Use "QT += testlib" consistently

If a project uses "load(qttest_p4)" it doesn't need to add testlib to
the CONFIG or QT variables.  If a project does not use
"load(qttest_p4)", it should add "testlib" to the QT variable.

Change-Id: If28353713ccdfe13612682e3e88dadebe2f2eefd
Reviewed-on: http://codereview.qt.nokia.com/159
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

11 files changed, 7 insertions, 36 deletions

diff --git a/examples/qtestlib/tutorial1/tutorial1.pro b/examples/qtestlib/tutorial1/tutorial1.pro
index fdbf2fc365..6da372bcbb 100644
--- a/examples/qtestlib/tutorial1/tutorial1.pro
+++ b/examples/qtestlib/tutorial1/tutorial1.pro
@@ -1,5 +1,5 @@
 SOURCES = testqstring.cpp
-CONFIG  += qtestlib
+QT += testlib
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial1
diff --git a/examples/qtestlib/tutorial2/tutorial2.pro b/examples/qtestlib/tutorial2/tutorial2.pro
index 647ddd75ae..06cf30fae9 100644
--- a/examples/qtestlib/tutorial2/tutorial2.pro
+++ b/examples/qtestlib/tutorial2/tutorial2.pro
@@ -1,5 +1,5 @@
 SOURCES = testqstring.cpp
-CONFIG  += qtestlib
+QT += testlib
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial2
diff --git a/examples/qtestlib/tutorial3/tutorial3.pro b/examples/qtestlib/tutorial3/tutorial3.pro
index 887fc9a592..ff39bd40bd 100644
--- a/examples/qtestlib/tutorial3/tutorial3.pro
+++ b/examples/qtestlib/tutorial3/tutorial3.pro
@@ -1,5 +1,5 @@
 SOURCES = testgui.cpp
-CONFIG  += qtestlib
+QT += testlib
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial3
diff --git a/examples/qtestlib/tutorial4/tutorial4.pro b/examples/qtestlib/tutorial4/tutorial4.pro
index 082a3a3caa..ae84726b83 100644
--- a/examples/qtestlib/tutorial4/tutorial4.pro
+++ b/examples/qtestlib/tutorial4/tutorial4.pro
@@ -1,5 +1,5 @@
 SOURCES = testgui.cpp
-CONFIG  += qtestlib
+QT += testlib
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial4
diff --git a/examples/qtestlib/tutorial5/tutorial5.pro b/examples/qtestlib/tutorial5/tutorial5.pro
index 4f70284309..085dfd8b67 100644
--- a/examples/qtestlib/tutorial5/tutorial5.pro
+++ b/examples/qtestlib/tutorial5/tutorial5.pro
@@ -1,5 +1,5 @@
 SOURCES = benchmarking.cpp
-CONFIG  += qtestlib
+QT += testlib
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial5
diff --git a/tests/auto/qcompleter/qcompleter.pro b/tests/auto/qcompleter/qcompleter.pro
index 39b5dd717e..bd352d819c 100644
--- a/tests/auto/qcompleter/qcompleter.pro
+++ b/tests/auto/qcompleter/qcompleter.pro
@@ -1,16 +1,8 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Wed Apr 26 13:53:24 2006
-######################################################################
 load(qttest_p4)
 TEMPLATE = app
 TARGET = tst_qcompleter
 DEPENDPATH += .
 INCLUDEPATH += . ..
 
-CONFIG += console qtestlib
-
 # Input
 SOURCES += tst_qcompleter.cpp 
-
-
-
diff --git a/tests/auto/qerrormessage/qerrormessage.pro b/tests/auto/qerrormessage/qerrormessage.pro
index 0db361081b..1c24aa83cb 100644
--- a/tests/auto/qerrormessage/qerrormessage.pro
+++ b/tests/auto/qerrormessage/qerrormessage.pro
@@ -1,15 +1,8 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Wed Apr 26 13:53:24 2006
-######################################################################
 load(qttest_p4)
 TEMPLATE = app
 TARGET = tst_qerrormessage
 DEPENDPATH += .
 INCLUDEPATH += . 
 
-CONFIG += console qtestlib
 # Input
 SOURCES += tst_qerrormessage.cpp
-
-
-
diff --git a/tests/auto/qlocalsocket/lackey/lackey.pro b/tests/auto/qlocalsocket/lackey/lackey.pro
index 6af58b122a..2573222c8b 100644
--- a/tests/auto/qlocalsocket/lackey/lackey.pro
+++ b/tests/auto/qlocalsocket/lackey/lackey.pro
@@ -1,10 +1,6 @@
 #include(../src/src.pri)
 
-QT = core script network
-
-requires(contains(QT_CONFIG,script))
-
-CONFIG += qtestlib
+QT = core script network testlib
 
 DESTDIR = ./
 
diff --git a/tests/auto/qmessagebox/qmessagebox.pro b/tests/auto/qmessagebox/qmessagebox.pro
index 9fa1738a79..a845e2186a 100644
--- a/tests/auto/qmessagebox/qmessagebox.pro
+++ b/tests/auto/qmessagebox/qmessagebox.pro
@@ -1,13 +1,9 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Wed Apr 26 13:53:24 2006
-######################################################################
 load(qttest_p4)
 TEMPLATE = app
 TARGET = tst_qmessagebox
 DEPENDPATH += .
 INCLUDEPATH += . 
 
-CONFIG += console qtestlib
 # Input
 SOURCES += tst_qmessagebox.cpp 
 
diff --git a/tests/auto/qtipc/lackey/lackey.pro b/tests/auto/qtipc/lackey/lackey.pro
index 2fa364c4c9..91659d701e 100644
--- a/tests/auto/qtipc/lackey/lackey.pro
+++ b/tests/auto/qtipc/lackey/lackey.pro
@@ -1,17 +1,12 @@
 include(../qsharedmemory/src/src.pri)
 
-QT = core script
-QT += core-private
-
-CONFIG += qtestlib
+QT = core-private script testlib
 
 DESTDIR = ./
 
 win32: CONFIG += console
 mac:CONFIG -= app_bundle
 
-requires(contains(QT_CONFIG,script))
-
 DEFINES	+= QSHAREDMEMORY_DEBUG
 DEFINES	+= QSYSTEMSEMAPHORE_DEBUG
 
diff --git a/tests/auto/uic/uic.pro b/tests/auto/uic/uic.pro
index 355cb56cea..0045015457 100644
--- a/tests/auto/uic/uic.pro
+++ b/tests/auto/uic/uic.pro
@@ -1,6 +1,5 @@
 load(qttest_p4)
 
-CONFIG += qtestlib
 SOURCES += tst_uic.cpp
 TARGET = tst_uic