tests: clean up usage of QT_CONFIG to fix circular dependencies

With modularized Qt, using QT_CONFIG is dangerous, because the behavior
changes depending on the order in which modules are qmake'd.

For example, an autotest doing:

  contains(QT_CONFIG,svg):QT += svg

...will depend on libQtSvg if (and only if) the autotest is qmake'd
_after_ qtsvg is qmake'd.

This makes the tested functionality unpredictable.
Also, if the above example occurs within qtbase, it causes the test to
sometimes have a circular dependency: if qtsvg is qmake'd before the
test is qmake'd, the test in qtbase depends on qtsvg which depends on
qtbase.

Tests must avoid functionality tests via QT_CONFIG except where all the
tested modules are dependencies of the current module.

Usage of QT_CONFIG with qt3support was entirely removed since Qt5
will not retain qt3support.

Reviewed-by: Jason McDonald
Change-Id: I5a5013b3ec7e1f38fb78864763c9e7586c15e70b

37 files changed, 2 insertions, 81 deletions

diff --git a/tests/auto/atwrapper/atWrapper.pro b/tests/auto/atwrapper/atWrapper.pro
index 02218833a9..323ca1bf5f 100644
--- a/tests/auto/atwrapper/atWrapper.pro
+++ b/tests/auto/atwrapper/atWrapper.pro
@@ -9,7 +9,6 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 QT += xml svg network
 
-contains(QT_CONFIG, qt3support): QT += qt3support
 contains(QT_CONFIG, opengl):QT += opengl
 
 include($$ARTHUR/datagenerator/datagenerator.pri)
diff --git a/tests/auto/host.pro b/tests/auto/host.pro
index 44216ae101..fe65940789 100644
--- a/tests/auto/host.pro
+++ b/tests/auto/host.pro
@@ -10,5 +10,3 @@ SUBDIRS=\
            #atwrapper \     # These tests need significant updating,
            #uiloader \      # they have hardcoded machine names etc.
 
-#contains(QT_CONFIG,qt3support):SUBDIRS+=uic3
-
diff --git a/tests/auto/moc/moc.pro b/tests/auto/moc/moc.pro
index e150d37619..3aa4655ad0 100644
--- a/tests/auto/moc/moc.pro
+++ b/tests/auto/moc/moc.pro
@@ -21,8 +21,6 @@ if(*-g++*|*-icc*|*-clang|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h win
 SOURCES += tst_moc.cpp
 
 QT += sql network
-contains(QT_CONFIG, script): QT += script
-contains(QT_CONFIG, qt3support): QT += qt3support
 contains(QT_CONFIG, dbus){
     DEFINES += WITH_DBUS
     QT += dbus
diff --git a/tests/auto/qaccessibility/qaccessibility.pro b/tests/auto/qaccessibility/qaccessibility.pro
index a4f606c672..21e286baea 100644
--- a/tests/auto/qaccessibility/qaccessibility.pro
+++ b/tests/auto/qaccessibility/qaccessibility.pro
@@ -2,10 +2,9 @@ load(qttest_p4)
 SOURCES  += tst_qaccessibility.cpp
 
 unix:!mac:LIBS+=-lm
-contains(QT_CONFIG, qt3support): QT += qt3support
 
 wince*: {
 	accessneeded.files = $$QT_BUILD_TREE\\plugins\\accessible\\*.dll
 	accessneeded.path = accessible
 	DEPLOYMENT += accessneeded
-}
\ No newline at end of file
+}
diff --git a/tests/auto/qalgorithms/qalgorithms.pro b/tests/auto/qalgorithms/qalgorithms.pro
index 02af317f60..9143da658d 100644
--- a/tests/auto/qalgorithms/qalgorithms.pro
+++ b/tests/auto/qalgorithms/qalgorithms.pro
@@ -2,4 +2,3 @@ load(qttest_p4)
 SOURCES  += tst_qalgorithms.cpp
 
 QT = core
-contains(QT_CONFIG, qt3support): QT += qt3support
diff --git a/tests/auto/qcombobox/qcombobox.pro b/tests/auto/qcombobox/qcombobox.pro
index f36a6fe622..2ac5c7c53b 100644
--- a/tests/auto/qcombobox/qcombobox.pro
+++ b/tests/auto/qcombobox/qcombobox.pro
@@ -1,4 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_qcombobox.cpp
-contains(QT_CONFIG, qt3support): QT += qt3support
 
diff --git a/tests/auto/qdatastream/qdatastream.pro b/tests/auto/qdatastream/qdatastream.pro
index eba7c006e5..39bd09ef86 100644
--- a/tests/auto/qdatastream/qdatastream.pro
+++ b/tests/auto/qdatastream/qdatastream.pro
@@ -7,7 +7,6 @@ else: DEFINES += SVGFILE=\\\"gearflowers.svg\\\"
 }
 
 # for qpaintdevicemetrics.h
-contains(QT_CONFIG, qt3support):QT += qt3support
 QT += svg
 
 
diff --git a/tests/auto/qdir/qdir.pro b/tests/auto/qdir/qdir.pro
index 384c048f61..fc266a2a97 100644
--- a/tests/auto/qdir/qdir.pro
+++ b/tests/auto/qdir/qdir.pro
@@ -18,7 +18,6 @@ wince* {
   LIBS += -lefsrv
   INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
 } else {
-  contains(QT_CONFIG, qt3support):QT += qt3support
   DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
 
diff --git a/tests/auto/qfileinfo/qfileinfo.pro b/tests/auto/qfileinfo/qfileinfo.pro
index b35b1e0028..6f01f6705f 100644
--- a/tests/auto/qfileinfo/qfileinfo.pro
+++ b/tests/auto/qfileinfo/qfileinfo.pro
@@ -30,6 +30,4 @@ wince* {
     DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
 
-contains(QT_CONFIG, qt3support): QT += qt3support
-
 CONFIG += parallel_test
diff --git a/tests/auto/qfocusevent/qfocusevent.pro b/tests/auto/qfocusevent/qfocusevent.pro
index 83ed9eb93c..17431cf5a1 100644
--- a/tests/auto/qfocusevent/qfocusevent.pro
+++ b/tests/auto/qfocusevent/qfocusevent.pro
@@ -1,6 +1,2 @@
 load(qttest_p4)
 SOURCES += tst_qfocusevent.cpp
-
-
-contains(QT_CONFIG, qt3support): QT += qt3support
-
diff --git a/tests/auto/qimage/qimage.pro b/tests/auto/qimage/qimage.pro
index f845ad7b1c..b517bc1237 100644
--- a/tests/auto/qimage/qimage.pro
+++ b/tests/auto/qimage/qimage.pro
@@ -19,6 +19,5 @@ wince*: {
       DEPLOYMENT += imagePlugins
    }
 } else {
-   contains(QT_CONFIG, qt3support): QT += qt3support
    DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
diff --git a/tests/auto/qinputcontext/qinputcontext.pro b/tests/auto/qinputcontext/qinputcontext.pro
index 4b3ab96653..ec6831e5cf 100644
--- a/tests/auto/qinputcontext/qinputcontext.pro
+++ b/tests/auto/qinputcontext/qinputcontext.pro
@@ -1,8 +1,6 @@
 load(qttest_p4)
 SOURCES  += tst_qinputcontext.cpp
 
-contains(QT_CONFIG, webkit):QT += webkit
-
 symbian {
     LIBS += -lws32 -lcone
 }
diff --git a/tests/auto/qiodevice/qiodevice.pro b/tests/auto/qiodevice/qiodevice.pro
index 29b0a05ddc..08996e8cd4 100644
--- a/tests/auto/qiodevice/qiodevice.pro
+++ b/tests/auto/qiodevice/qiodevice.pro
@@ -17,7 +17,6 @@ wince*: {
    TARGET.CAPABILITY = NetworkServices
 } else {
    DEFINES += SRCDIR=\\\"$$PWD/\\\"
-   contains(QT_CONFIG, qt3support):QT += qt3support
 }
 MOC_DIR=tmp
 
diff --git a/tests/auto/qlayout/qlayout.pro b/tests/auto/qlayout/qlayout.pro
index 3fbc580d5c..e84018f0a1 100644
--- a/tests/auto/qlayout/qlayout.pro
+++ b/tests/auto/qlayout/qlayout.pro
@@ -3,7 +3,6 @@ load(qttest_p4)
 QT += gui-private
 
 SOURCES += tst_qlayout.cpp
-contains(QT_CONFIG, qt3support): QT += qt3support
 wince*|symbian: {
    addFiles.files = baseline
    addFiles.path = .
diff --git a/tests/auto/qlineedit/qlineedit.pro b/tests/auto/qlineedit/qlineedit.pro
index 1f862b414b..bb6d95027b 100644
--- a/tests/auto/qlineedit/qlineedit.pro
+++ b/tests/auto/qlineedit/qlineedit.pro
@@ -1,6 +1,2 @@
 load(qttest_p4)
-contains(QT_CONFIG,qt3support) QT += qt3support
 SOURCES  += tst_qlineedit.cpp
-
-
-
diff --git a/tests/auto/qlocalsocket/lackey/lackey.pro b/tests/auto/qlocalsocket/lackey/lackey.pro
index 8182394dd3..6af58b122a 100644
--- a/tests/auto/qlocalsocket/lackey/lackey.pro
+++ b/tests/auto/qlocalsocket/lackey/lackey.pro
@@ -17,4 +17,4 @@ DEFINES += QLOCALSOCKET_DEBUG
 SOURCES		+= main.cpp
 TARGET		= lackey
 
-symbian:TARGET.CAPABILITY = ALL -TCB
\ No newline at end of file
+symbian:TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qmenu/qmenu.pro b/tests/auto/qmenu/qmenu.pro
index e1fcb884d5..3a32920b14 100644
--- a/tests/auto/qmenu/qmenu.pro
+++ b/tests/auto/qmenu/qmenu.pro
@@ -1,7 +1,2 @@
 load(qttest_p4)
 SOURCES  += tst_qmenu.cpp
-
-contains(QT_CONFIG, qt3support): QT += qt3support
-
-
-
diff --git a/tests/auto/qmenubar/qmenubar.pro b/tests/auto/qmenubar/qmenubar.pro
index adce164209..ba2dea8eb7 100644
--- a/tests/auto/qmenubar/qmenubar.pro
+++ b/tests/auto/qmenubar/qmenubar.pro
@@ -1,6 +1,2 @@
 load(qttest_p4)
-HEADERS += 
 SOURCES += tst_qmenubar.cpp
-
-contains(QT_CONFIG, qt3support):!symbian:QT += qt3support
-
diff --git a/tests/auto/qmouseevent/qmouseevent.pro b/tests/auto/qmouseevent/qmouseevent.pro
index f162c1130a..0e5ddadc1f 100644
--- a/tests/auto/qmouseevent/qmouseevent.pro
+++ b/tests/auto/qmouseevent/qmouseevent.pro
@@ -1,5 +1,2 @@
 load(qttest_p4)
 SOURCES += tst_qmouseevent.cpp
-
-contains(QT_CONFIG, qt3support): QT += qt3support
-
diff --git a/tests/auto/qobject/tst_qobject.pro b/tests/auto/qobject/tst_qobject.pro
index 5745e671c2..e31fed5d10 100644
--- a/tests/auto/qobject/tst_qobject.pro
+++ b/tests/auto/qobject/tst_qobject.pro
@@ -8,7 +8,6 @@ SOURCES += moc_oldnormalizeobject.cpp
 QT = core \
     network \
     gui
-contains(QT_CONFIG, qt3support):DEFINES += QT_HAS_QT3SUPPORT
 wince*: { 
     addFiles.files = signalbug.exe
     addFiles.path = .
diff --git a/tests/auto/qpainter/qpainter.pro b/tests/auto/qpainter/qpainter.pro
index 2db6ff381e..0a1bebcfb6 100644
--- a/tests/auto/qpainter/qpainter.pro
+++ b/tests/auto/qpainter/qpainter.pro
@@ -2,7 +2,6 @@ load(qttest_p4)
 
 QT += gui-private
 
-contains(QT_CONFIG, qt3support): QT += qt3support
 SOURCES  += tst_qpainter.cpp
 wince*|symbian: {
     addFiles.files = drawEllipse drawLine_rop_bitmap drawPixmap_rop drawPixmap_rop_bitmap task217400.png
diff --git a/tests/auto/qpixmap/qpixmap.pro b/tests/auto/qpixmap/qpixmap.pro
index 9f8e2f4166..f5df30cc1d 100644
--- a/tests/auto/qpixmap/qpixmap.pro
+++ b/tests/auto/qpixmap/qpixmap.pro
@@ -3,7 +3,6 @@ load(qttest_p4)
 QT += core-private gui-private
 
 SOURCES  += tst_qpixmap.cpp
-contains(QT_CONFIG, qt3support): QT += qt3support
 wince*|symbian: {
 
    task31722_0.files = convertFromImage/task31722_0/*.png
diff --git a/tests/auto/qprinter/qprinter.pro b/tests/auto/qprinter/qprinter.pro
index 1df29748cc..ef310b82c8 100644
--- a/tests/auto/qprinter/qprinter.pro
+++ b/tests/auto/qprinter/qprinter.pro
@@ -1,8 +1,2 @@
 load(qttest_p4)
 SOURCES  += tst_qprinter.cpp
-
-
-contains(QT_CONFIG, qt3support): QT += qt3support
-
-
-
diff --git a/tests/auto/qsettings/qsettings.pro b/tests/auto/qsettings/qsettings.pro
index 151660d21c..35bb56cc98 100644
--- a/tests/auto/qsettings/qsettings.pro
+++ b/tests/auto/qsettings/qsettings.pro
@@ -5,7 +5,6 @@ QT += core-private
 SOURCES  += tst_qsettings.cpp
 RESOURCES += qsettings.qrc
 
-contains(QT_CONFIG, qt3support):QT += qt3support
 CONFIG -= debug
 CONFIG += release
 win32-msvc*:LIBS += advapi32.lib
diff --git a/tests/auto/qsplitter/qsplitter.pro b/tests/auto/qsplitter/qsplitter.pro
index 5422fae00c..bca4fc40fd 100644
--- a/tests/auto/qsplitter/qsplitter.pro
+++ b/tests/auto/qsplitter/qsplitter.pro
@@ -2,8 +2,6 @@ load(qttest_p4)
 SOURCES  += tst_qsplitter.cpp
 
 
-contains(QT_CONFIG, qt3support): QT += qt3support
-
 wince*|symbian: {
    addFiles.files = extradata.txt setSizes3.dat
    addFiles.path = .
diff --git a/tests/auto/qsql/qsql.pro b/tests/auto/qsql/qsql.pro
index 6d132f5b68..e367a8e1c1 100644
--- a/tests/auto/qsql/qsql.pro
+++ b/tests/auto/qsql/qsql.pro
@@ -3,8 +3,6 @@ SOURCES  += tst_qsql.cpp
 
 QT += sql sql-private
 
-contains(QT_CONFIG, qt3support): QT += qt3support
-
 wince*: {
    DEPLOYMENT_PLUGIN += qsqlite
 }
diff --git a/tests/auto/qsqldatabase/qsqldatabase.pro b/tests/auto/qsqldatabase/qsqldatabase.pro
index 066c24f395..ee78b79c36 100644
--- a/tests/auto/qsqldatabase/qsqldatabase.pro
+++ b/tests/auto/qsqldatabase/qsqldatabase.pro
@@ -3,8 +3,6 @@ SOURCES  += tst_qsqldatabase.cpp
 
 QT += sql
 
-contains(QT_CONFIG, qt3support): QT += qt3support
-
 win32: {
    !wince*: LIBS += -lws2_32
    else: LIBS += -lws2
diff --git a/tests/auto/qtabwidget/qtabwidget.pro b/tests/auto/qtabwidget/qtabwidget.pro
index 37aec5fc2a..69296cae2b 100644
--- a/tests/auto/qtabwidget/qtabwidget.pro
+++ b/tests/auto/qtabwidget/qtabwidget.pro
@@ -6,7 +6,6 @@ INCLUDEPATH += ../
 
 HEADERS +=  
 SOURCES += tst_qtabwidget.cpp
-contains(QT_CONFIG, qt3support): QT += qt3support
 
 win32:!wince*:LIBS += -luser32
 
diff --git a/tests/auto/qtcpsocket/stressTest/stressTest.pro b/tests/auto/qtcpsocket/stressTest/stressTest.pro
index adf021783b..f6215f80a0 100644
--- a/tests/auto/qtcpsocket/stressTest/stressTest.pro
+++ b/tests/auto/qtcpsocket/stressTest/stressTest.pro
@@ -1,7 +1,6 @@
 HEADERS += Test.h
 SOURCES += main.cpp Test.cpp
 QT += network
-contains(QT_CONFIG, qt3support): QT += qt3support
 
 CONFIG -= app_bundle
 CONFIG += console
diff --git a/tests/auto/qtextbrowser/qtextbrowser.pro b/tests/auto/qtextbrowser/qtextbrowser.pro
index 773fb975a8..415f9cace2 100644
--- a/tests/auto/qtextbrowser/qtextbrowser.pro
+++ b/tests/auto/qtextbrowser/qtextbrowser.pro
@@ -2,8 +2,6 @@ load(qttest_p4)
 SOURCES += tst_qtextbrowser.cpp
 !symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
 
-contains(QT_CONFIG, qt3support): QT += qt3support
-
 
 wince*|symbian: {
    addFiles.files = *.html
diff --git a/tests/auto/qtextedit/qtextedit.pro b/tests/auto/qtextedit/qtextedit.pro
index e7d6c039a6..cef2b300d7 100644
--- a/tests/auto/qtextedit/qtextedit.pro
+++ b/tests/auto/qtextedit/qtextedit.pro
@@ -16,5 +16,3 @@ wince* {
 } else:!symbian {
     DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
-
-contains(QT_CONFIG, qt3support): QT += qt3support
diff --git a/tests/auto/qtextstream/test/test.pro b/tests/auto/qtextstream/test/test.pro
index 8805fb9f61..e0eb4ef193 100644
--- a/tests/auto/qtextstream/test/test.pro
+++ b/tests/auto/qtextstream/test/test.pro
@@ -13,7 +13,6 @@ win32 {
 
 RESOURCES += ../qtextstream.qrc
 
-contains(QT_CONFIG, qt3support):QT += qt3support
 QT = core network
 
 
diff --git a/tests/auto/qtoolbutton/qtoolbutton.pro b/tests/auto/qtoolbutton/qtoolbutton.pro
index 4ee0d3745a..d30d092670 100644
--- a/tests/auto/qtoolbutton/qtoolbutton.pro
+++ b/tests/auto/qtoolbutton/qtoolbutton.pro
@@ -1,11 +1,2 @@
-############################################################
-# Project file for autotest for file qtoolbutton.h
-############################################################
-
 load(qttest_p4)
-
 SOURCES += tst_qtoolbutton.cpp
-contains(QT_CONFIG, qt3support): QT += qt3support
-
-                                       
-
diff --git a/tests/auto/qvariant/qvariant.pro b/tests/auto/qvariant/qvariant.pro
index 2c9c8d76b1..4824c11078 100644
--- a/tests/auto/qvariant/qvariant.pro
+++ b/tests/auto/qvariant/qvariant.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_qvariant.cpp
 QT += network
-
-contains(QT_CONFIG, qt3support): QT += qt3support
diff --git a/tests/auto/qwidget/qwidget.pro b/tests/auto/qwidget/qwidget.pro
index fbbed3d8fa..dfb7358127 100644
--- a/tests/auto/qwidget/qwidget.pro
+++ b/tests/auto/qwidget/qwidget.pro
@@ -5,9 +5,6 @@ QT += core-private gui-private
 SOURCES  += tst_qwidget.cpp
 RESOURCES     = qwidget.qrc
 
-contains(QT_CONFIG, qt3support): QT += qt3support
-contains(QT_CONFIG, qt3support):DEFINES+=QT_HAS_QT3SUPPORT
-
 aix-g++*:QMAKE_CXXFLAGS+=-fpermissive
 
 CONFIG += x11inc
diff --git a/tests/auto/qworkspace/qworkspace.pro b/tests/auto/qworkspace/qworkspace.pro
index 0d2c261f17..de4d29a229 100644
--- a/tests/auto/qworkspace/qworkspace.pro
+++ b/tests/auto/qworkspace/qworkspace.pro
@@ -1,6 +1,2 @@
 load(qttest_p4)
 SOURCES  += tst_qworkspace.cpp
-
-
-
-contains(QT_CONFIG, qt3support): QT += qt3support
diff --git a/tests/auto/uiloader/uiloader/uiloader.pro b/tests/auto/uiloader/uiloader/uiloader.pro
index 4e95956522..b959d438b7 100644
--- a/tests/auto/uiloader/uiloader/uiloader.pro
+++ b/tests/auto/uiloader/uiloader/uiloader.pro
@@ -14,7 +14,6 @@ win32 {
 }
 
 QT += xml svg network
-contains(QT_CONFIG, qt3support): QT += qt3support
 
 wince*|symbian: {
    configuration.files = ../*.ini