Fixes qt3support unit tests generating compile failures when Qt is not

configured with qt3support.

The build system knows when qt3support was turned off, so let's just
skip these tests in that case.  That makes more sense than individually
configuring each autotest machine to skip these tests when the
configuration is known to turn off qt3support, which is what's done
previously.

Reviewed-by: Lincoln Ramsay

53 files changed, 62 insertions, 9 deletions

diff --git a/tests/auto/q3accel/q3accel.pro b/tests/auto/q3accel/q3accel.pro
index 002033f372..61d4f38756 100644
--- a/tests/auto/q3accel/q3accel.pro
+++ b/tests/auto/q3accel/q3accel.pro
@@ -3,6 +3,7 @@ HEADERS +=
 SOURCES += tst_q3accel.cpp
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
 
diff --git a/tests/auto/q3action/q3action.pro b/tests/auto/q3action/q3action.pro
index ee5d780d6b..c85a158730 100644
--- a/tests/auto/q3action/q3action.pro
+++ b/tests/auto/q3action/q3action.pro
@@ -1,3 +1,4 @@
 load(qttest_p4)
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 SOURCES += tst_q3action.cpp 
diff --git a/tests/auto/q3actiongroup/q3actiongroup.pro b/tests/auto/q3actiongroup/q3actiongroup.pro
index bfe1f684a3..139e48c6a1 100644
--- a/tests/auto/q3actiongroup/q3actiongroup.pro
+++ b/tests/auto/q3actiongroup/q3actiongroup.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 SOURCES += tst_q3actiongroup.cpp 
 
 
diff --git a/tests/auto/q3buttongroup/clickLock/clickLock.pro b/tests/auto/q3buttongroup/clickLock/clickLock.pro
index 68f5ed20e1..a1aa105c8a 100644
--- a/tests/auto/q3buttongroup/clickLock/clickLock.pro
+++ b/tests/auto/q3buttongroup/clickLock/clickLock.pro
@@ -3,7 +3,8 @@ TEMPLATE = app
 win32:TARGET = ../clickLock
 !win32:TARGET = clickLock
 
-contains(QT_CONFIG, qt3support): QT += qt3support
+QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 DEPENDPATH += .
 INCLUDEPATH += .
 CONFIG -= app_bundle
diff --git a/tests/auto/q3buttongroup/tst_q3buttongroup.pro b/tests/auto/q3buttongroup/tst_q3buttongroup.pro
index 8ec25d0aaa..9f1f090d9b 100644
--- a/tests/auto/q3buttongroup/tst_q3buttongroup.pro
+++ b/tests/auto/q3buttongroup/tst_q3buttongroup.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 # Input
 SOURCES += tst_q3buttongroup.cpp
diff --git a/tests/auto/q3canvas/q3canvas.pro b/tests/auto/q3canvas/q3canvas.pro
index cac538d401..70e9b8881b 100644
--- a/tests/auto/q3canvas/q3canvas.pro
+++ b/tests/auto/q3canvas/q3canvas.pro
@@ -3,5 +3,6 @@ SOURCES  += tst_q3canvas.cpp
 
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3checklistitem/q3checklistitem.pro b/tests/auto/q3checklistitem/q3checklistitem.pro
index 77d96e8529..9ae9c55f42 100644
--- a/tests/auto/q3checklistitem/q3checklistitem.pro
+++ b/tests/auto/q3checklistitem/q3checklistitem.pro
@@ -3,5 +3,6 @@ SOURCES  += tst_q3checklistitem.cpp
 
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3combobox/q3combobox.pro b/tests/auto/q3combobox/q3combobox.pro
index 2391f6cd9c..7dcde2b5e8 100644
--- a/tests/auto/q3combobox/q3combobox.pro
+++ b/tests/auto/q3combobox/q3combobox.pro
@@ -1,3 +1,4 @@
 load(qttest_p4)
 SOURCES  += tst_q3combobox.cpp
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
diff --git a/tests/auto/q3cstring/q3cstring.pro b/tests/auto/q3cstring/q3cstring.pro
index 78077b80f1..1171093f73 100644
--- a/tests/auto/q3cstring/q3cstring.pro
+++ b/tests/auto/q3cstring/q3cstring.pro
@@ -3,5 +3,6 @@ SOURCES  += tst_q3cstring.cpp
 
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3databrowser/q3databrowser.pro b/tests/auto/q3databrowser/q3databrowser.pro
index 09c16b7b2c..d65a5ef60e 100644
--- a/tests/auto/q3databrowser/q3databrowser.pro
+++ b/tests/auto/q3databrowser/q3databrowser.pro
@@ -2,5 +2,6 @@ load(qttest_p4)
 
 SOURCES += tst_q3databrowser.cpp
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3dateedit/q3dateedit.pro b/tests/auto/q3dateedit/q3dateedit.pro
index ba585cec25..85e0ebf728 100644
--- a/tests/auto/q3dateedit/q3dateedit.pro
+++ b/tests/auto/q3dateedit/q3dateedit.pro
@@ -1,6 +1,7 @@
 load(qttest_p4)
 SOURCES += tst_q3dateedit.cpp 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
 
diff --git a/tests/auto/q3datetimeedit/q3datetimeedit.pro b/tests/auto/q3datetimeedit/q3datetimeedit.pro
index f2c00978a3..9c980be455 100644
--- a/tests/auto/q3datetimeedit/q3datetimeedit.pro
+++ b/tests/auto/q3datetimeedit/q3datetimeedit.pro
@@ -4,6 +4,7 @@
 
 load(qttest_p4)
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 SOURCES += tst_q3datetimeedit.cpp
 
diff --git a/tests/auto/q3deepcopy/q3deepcopy.pro b/tests/auto/q3deepcopy/q3deepcopy.pro
index 04e06902ec..9ac1a10efb 100644
--- a/tests/auto/q3deepcopy/q3deepcopy.pro
+++ b/tests/auto/q3deepcopy/q3deepcopy.pro
@@ -3,5 +3,6 @@ SOURCES  += tst_q3deepcopy.cpp
 
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3dict/q3dict.pro b/tests/auto/q3dict/q3dict.pro
index 5ccd87573e..7bbea6164d 100644
--- a/tests/auto/q3dict/q3dict.pro
+++ b/tests/auto/q3dict/q3dict.pro
@@ -3,5 +3,6 @@ SOURCES += tst_q3dict.cpp
 
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3dns/q3dns.pro b/tests/auto/q3dns/q3dns.pro
index 10c24e5854..7fd2e4caec 100644
--- a/tests/auto/q3dns/q3dns.pro
+++ b/tests/auto/q3dns/q3dns.pro
@@ -3,5 +3,6 @@ SOURCES  += tst_q3dns.cpp
 
 
 QT += network qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3dockwindow/q3dockwindow.pro b/tests/auto/q3dockwindow/q3dockwindow.pro
index 5f23c40e0a..1352123d0d 100644
--- a/tests/auto/q3dockwindow/q3dockwindow.pro
+++ b/tests/auto/q3dockwindow/q3dockwindow.pro
@@ -3,6 +3,7 @@ HEADERS +=
 SOURCES += tst_q3dockwindow.cpp
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
 
diff --git a/tests/auto/q3filedialog/q3filedialog.pro b/tests/auto/q3filedialog/q3filedialog.pro
index 239411162b..f57f9c0caf 100644
--- a/tests/auto/q3filedialog/q3filedialog.pro
+++ b/tests/auto/q3filedialog/q3filedialog.pro
@@ -4,6 +4,7 @@
 
 load(qttest_p4)
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 SOURCES += tst_q3filedialog.cpp
 
diff --git a/tests/auto/q3frame/q3frame.pro b/tests/auto/q3frame/q3frame.pro
index 7f0d24ff7a..1d1f5a7aab 100644
--- a/tests/auto/q3frame/q3frame.pro
+++ b/tests/auto/q3frame/q3frame.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 SOURCES += tst_q3frame.cpp
diff --git a/tests/auto/q3groupbox/q3groupbox.pro b/tests/auto/q3groupbox/q3groupbox.pro
index 5153a25bdb..fd4cced356 100644
--- a/tests/auto/q3groupbox/q3groupbox.pro
+++ b/tests/auto/q3groupbox/q3groupbox.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 # Input
 SOURCES += tst_q3groupbox.cpp
diff --git a/tests/auto/q3hbox/q3hbox.pro b/tests/auto/q3hbox/q3hbox.pro
index d5b7c65222..bbd7f5bc1e 100644
--- a/tests/auto/q3hbox/q3hbox.pro
+++ b/tests/auto/q3hbox/q3hbox.pro
@@ -2,6 +2,7 @@ load(qttest_p4)
 SOURCES += tst_q3hbox.cpp
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
 
diff --git a/tests/auto/q3header/q3header.pro b/tests/auto/q3header/q3header.pro
index 64ffb0fb9a..d1a913a955 100644
--- a/tests/auto/q3header/q3header.pro
+++ b/tests/auto/q3header/q3header.pro
@@ -2,6 +2,7 @@ load(qttest_p4)
 SOURCES += tst_q3header.cpp
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
 
diff --git a/tests/auto/q3iconview/q3iconview.pro b/tests/auto/q3iconview/q3iconview.pro
index 37a138be32..9416c08ddd 100644
--- a/tests/auto/q3iconview/q3iconview.pro
+++ b/tests/auto/q3iconview/q3iconview.pro
@@ -2,6 +2,7 @@ load(qttest_p4)
 SOURCES  += tst_q3iconview.cpp
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
 
diff --git a/tests/auto/q3listbox/q3listbox.pro b/tests/auto/q3listbox/q3listbox.pro
index d193ace198..dc2d197395 100644
--- a/tests/auto/q3listbox/q3listbox.pro
+++ b/tests/auto/q3listbox/q3listbox.pro
@@ -2,6 +2,7 @@ load(qttest_p4)
 SOURCES  += tst_qlistbox.cpp
 
 
-contains(QT_CONFIG, qt3support): QT += qt3support
+QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3listview/q3listview.pro b/tests/auto/q3listview/q3listview.pro
index 56c62d1c09..5d72ea6a9e 100644
--- a/tests/auto/q3listview/q3listview.pro
+++ b/tests/auto/q3listview/q3listview.pro
@@ -2,4 +2,5 @@ load(qttest_p4)
 
 SOURCES += tst_q3listview.cpp
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
diff --git a/tests/auto/q3listviewitemiterator/q3listviewitemiterator.pro b/tests/auto/q3listviewitemiterator/q3listviewitemiterator.pro
index 143e0c0f87..b50d0128f7 100644
--- a/tests/auto/q3listviewitemiterator/q3listviewitemiterator.pro
+++ b/tests/auto/q3listviewitemiterator/q3listviewitemiterator.pro
@@ -2,6 +2,7 @@ load(qttest_p4)
 SOURCES  += tst_q3listviewitemiterator.cpp
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
 
diff --git a/tests/auto/q3mainwindow/q3mainwindow.pro b/tests/auto/q3mainwindow/q3mainwindow.pro
index 7a198d12d4..c4cb7c4035 100644
--- a/tests/auto/q3mainwindow/q3mainwindow.pro
+++ b/tests/auto/q3mainwindow/q3mainwindow.pro
@@ -2,6 +2,7 @@ load(qttest_p4)
 SOURCES  += tst_q3mainwindow.cpp
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 CONFIG += console
 
diff --git a/tests/auto/q3popupmenu/q3popupmenu.pro b/tests/auto/q3popupmenu/q3popupmenu.pro
index c9c0dd52d2..216722bed8 100644
--- a/tests/auto/q3popupmenu/q3popupmenu.pro
+++ b/tests/auto/q3popupmenu/q3popupmenu.pro
@@ -4,5 +4,6 @@
 
 load(qttest_p4)
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 SOURCES += tst_q3popupmenu.cpp
diff --git a/tests/auto/q3process/q3process.pro b/tests/auto/q3process/q3process.pro
index 8dc3541e6a..a665c2be99 100644
--- a/tests/auto/q3process/q3process.pro
+++ b/tests/auto/q3process/q3process.pro
@@ -5,6 +5,7 @@ SUBDIRS	=	cat \
 		tst
 TARGET = tst_q3process
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 #no install rule for subdir
 INSTALLS =
diff --git a/tests/auto/q3process/tst/tst.pro b/tests/auto/q3process/tst/tst.pro
index 090d76b35e..359148b58f 100644
--- a/tests/auto/q3process/tst/tst.pro
+++ b/tests/auto/q3process/tst/tst.pro
@@ -11,6 +11,7 @@ win32 {
   }
 }
 
-contains(QT_CONFIG, qt3support): QT += qt3support
+QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3progressbar/q3progressbar.pro b/tests/auto/q3progressbar/q3progressbar.pro
index b3c8864eed..582c39efd7 100644
--- a/tests/auto/q3progressbar/q3progressbar.pro
+++ b/tests/auto/q3progressbar/q3progressbar.pro
@@ -4,6 +4,7 @@
 
 load(qttest_p4)
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 SOURCES += tst_q3progressbar.cpp
 
diff --git a/tests/auto/q3progressdialog/q3progressdialog.pro b/tests/auto/q3progressdialog/q3progressdialog.pro
index 65e24edde0..08528db9c7 100644
--- a/tests/auto/q3progressdialog/q3progressdialog.pro
+++ b/tests/auto/q3progressdialog/q3progressdialog.pro
@@ -4,6 +4,7 @@
 
 load(qttest_p4)
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 SOURCES += tst_q3progressdialog.cpp
 
diff --git a/tests/auto/q3ptrlist/q3ptrlist.pro b/tests/auto/q3ptrlist/q3ptrlist.pro
index 186a707526..d7431f4560 100644
--- a/tests/auto/q3ptrlist/q3ptrlist.pro
+++ b/tests/auto/q3ptrlist/q3ptrlist.pro
@@ -2,5 +2,6 @@ load(qttest_p4)
 SOURCES += tst_q3ptrlist.cpp
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3richtext/q3richtext.pro b/tests/auto/q3richtext/q3richtext.pro
index 2d4fc5a6fd..e22fa377dc 100644
--- a/tests/auto/q3richtext/q3richtext.pro
+++ b/tests/auto/q3richtext/q3richtext.pro
@@ -3,6 +3,7 @@ HEADERS +=
 SOURCES += tst_q3richtext.cpp
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
 
diff --git a/tests/auto/q3scrollview/q3scrollview.pro b/tests/auto/q3scrollview/q3scrollview.pro
index 1750e8bc51..d98d23469f 100644
--- a/tests/auto/q3scrollview/q3scrollview.pro
+++ b/tests/auto/q3scrollview/q3scrollview.pro
@@ -2,6 +2,7 @@ load(qttest_p4)
 SOURCES  += tst_qscrollview.cpp
 
 
-contains(QT_CONFIG, qt3support): QT += qt3support
+QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3semaphore/q3semaphore.pro b/tests/auto/q3semaphore/q3semaphore.pro
index ad8c15424e..935917dd47 100644
--- a/tests/auto/q3semaphore/q3semaphore.pro
+++ b/tests/auto/q3semaphore/q3semaphore.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 SOURCES += tst_q3semaphore.cpp
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3serversocket/q3serversocket.pro b/tests/auto/q3serversocket/q3serversocket.pro
index 4fa9dce952..4e5e364c9f 100644
--- a/tests/auto/q3serversocket/q3serversocket.pro
+++ b/tests/auto/q3serversocket/q3serversocket.pro
@@ -3,5 +3,6 @@ SOURCES  += tst_q3serversocket.cpp
 
 
 QT += network qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3socket/q3socket.pro b/tests/auto/q3socket/q3socket.pro
index a9bf0c011d..a8324e91a5 100644
--- a/tests/auto/q3socket/q3socket.pro
+++ b/tests/auto/q3socket/q3socket.pro
@@ -2,5 +2,6 @@ load(qttest_p4)
 SOURCES  += tst_qsocket.cpp
 
 QT += network qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3socketdevice/q3socketdevice.pro b/tests/auto/q3socketdevice/q3socketdevice.pro
index c6e9e93e94..d2cbfb2d37 100644
--- a/tests/auto/q3socketdevice/q3socketdevice.pro
+++ b/tests/auto/q3socketdevice/q3socketdevice.pro
@@ -2,5 +2,6 @@ load(qttest_p4)
 SOURCES  += tst_q3socketdevice.cpp
 
 QT += network qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3sqlcursor/q3sqlcursor.pro b/tests/auto/q3sqlcursor/q3sqlcursor.pro
index 28445404cf..2d316fb722 100644
--- a/tests/auto/q3sqlcursor/q3sqlcursor.pro
+++ b/tests/auto/q3sqlcursor/q3sqlcursor.pro
@@ -2,6 +2,7 @@ load(qttest_p4)
 SOURCES  += tst_q3sqlcursor.cpp
 
 QT += sql qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 win32:LIBS += -lws2_32
 
diff --git a/tests/auto/q3sqlselectcursor/q3sqlselectcursor.pro b/tests/auto/q3sqlselectcursor/q3sqlselectcursor.pro
index 21e311fde4..59448ebfe6 100644
--- a/tests/auto/q3sqlselectcursor/q3sqlselectcursor.pro
+++ b/tests/auto/q3sqlselectcursor/q3sqlselectcursor.pro
@@ -2,6 +2,7 @@ load(qttest_p4)
 SOURCES  += tst_q3sqlselectcursor.cpp
 
 QT += sql qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 win32:LIBS += -lws2_32
 
diff --git a/tests/auto/q3stylesheet/q3stylesheet.pro b/tests/auto/q3stylesheet/q3stylesheet.pro
index a5e8438f09..f0fcd8bc74 100644
--- a/tests/auto/q3stylesheet/q3stylesheet.pro
+++ b/tests/auto/q3stylesheet/q3stylesheet.pro
@@ -4,6 +4,7 @@
 
 load(qttest_p4)
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 SOURCES += tst_q3stylesheet.cpp
 
diff --git a/tests/auto/q3tabdialog/q3tabdialog.pro b/tests/auto/q3tabdialog/q3tabdialog.pro
index 1ba72f9e8f..815510d464 100644
--- a/tests/auto/q3tabdialog/q3tabdialog.pro
+++ b/tests/auto/q3tabdialog/q3tabdialog.pro
@@ -4,6 +4,7 @@
 
 load(qttest_p4)
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 SOURCES += tst_q3tabdialog.cpp
 
diff --git a/tests/auto/q3table/q3table.pro b/tests/auto/q3table/q3table.pro
index 6d96a4e981..bdda8baa5f 100644
--- a/tests/auto/q3table/q3table.pro
+++ b/tests/auto/q3table/q3table.pro
@@ -2,5 +2,6 @@ load(qttest_p4)
 SOURCES += tst_q3table.cpp
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3textbrowser/q3textbrowser.pro b/tests/auto/q3textbrowser/q3textbrowser.pro
index 8ddeaba503..4dfd12ebfd 100644
--- a/tests/auto/q3textbrowser/q3textbrowser.pro
+++ b/tests/auto/q3textbrowser/q3textbrowser.pro
@@ -3,6 +3,7 @@ HEADERS +=
 SOURCES += tst_q3textbrowser.cpp
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
 
diff --git a/tests/auto/q3textedit/q3textedit.pro b/tests/auto/q3textedit/q3textedit.pro
index a4b24a9588..ff90c4aa29 100644
--- a/tests/auto/q3textedit/q3textedit.pro
+++ b/tests/auto/q3textedit/q3textedit.pro
@@ -4,5 +4,6 @@ SOURCES += tst_q3textedit.cpp
 
 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3textstream/q3textstream.pro b/tests/auto/q3textstream/q3textstream.pro
index 7c80af7d05..bf2584aaa1 100644
--- a/tests/auto/q3textstream/q3textstream.pro
+++ b/tests/auto/q3textstream/q3textstream.pro
@@ -1,6 +1,7 @@
 load(qttest_p4)
 SOURCES  += tst_q3textstream.cpp
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 MOC_DIR=tmp
 
 
diff --git a/tests/auto/q3timeedit/q3timeedit.pro b/tests/auto/q3timeedit/q3timeedit.pro
index 17b4a8490f..0f231df4e2 100644
--- a/tests/auto/q3timeedit/q3timeedit.pro
+++ b/tests/auto/q3timeedit/q3timeedit.pro
@@ -1,6 +1,7 @@
 load(qttest_p4)
 SOURCES += tst_q3timeedit.cpp 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
 
diff --git a/tests/auto/q3toolbar/q3toolbar.pro b/tests/auto/q3toolbar/q3toolbar.pro
index 8fcab99282..974f14f756 100644
--- a/tests/auto/q3toolbar/q3toolbar.pro
+++ b/tests/auto/q3toolbar/q3toolbar.pro
@@ -1,6 +1,7 @@
 load(qttest_p4)
 SOURCES += tst_q3toolbar.cpp 
 QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
 
diff --git a/tests/auto/q3uridrag/q3uridrag.pro b/tests/auto/q3uridrag/q3uridrag.pro
index 526623eaec..b6e77fcf26 100644
--- a/tests/auto/q3uridrag/q3uridrag.pro
+++ b/tests/auto/q3uridrag/q3uridrag.pro
@@ -2,6 +2,7 @@ load(qttest_p4)
 SOURCES += tst_q3uridrag.cpp
 
 
-contains(QT_CONFIG, qt3support): QT += qt3support
+QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3urloperator/q3urloperator.pro b/tests/auto/q3urloperator/q3urloperator.pro
index 3364dace60..29282eb5da 100644
--- a/tests/auto/q3urloperator/q3urloperator.pro
+++ b/tests/auto/q3urloperator/q3urloperator.pro
@@ -2,7 +2,8 @@ load(qttest_p4)
 SOURCES  += tst_q3urloperator.cpp
 
 
-contains(QT_CONFIG, qt3support): QT += qt3support
+QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 QT += network
 
 
diff --git a/tests/auto/q3valuelist/q3valuelist.pro b/tests/auto/q3valuelist/q3valuelist.pro
index ab82d316d4..d35977906c 100644
--- a/tests/auto/q3valuelist/q3valuelist.pro
+++ b/tests/auto/q3valuelist/q3valuelist.pro
@@ -2,6 +2,7 @@ load(qttest_p4)
 SOURCES  += tst_q3valuelist.cpp
 
 
-contains(QT_CONFIG, qt3support): QT += qt3support
+QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3valuevector/q3valuevector.pro b/tests/auto/q3valuevector/q3valuevector.pro
index 883fda20b9..55956cb7fe 100644
--- a/tests/auto/q3valuevector/q3valuevector.pro
+++ b/tests/auto/q3valuevector/q3valuevector.pro
@@ -2,6 +2,7 @@ load(qttest_p4)
 SOURCES  += tst_q3valuevector.cpp
 
 
-contains(QT_CONFIG, qt3support): QT += qt3support
+QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
 
 
diff --git a/tests/auto/q3widgetstack/q3widgetstack.pro b/tests/auto/q3widgetstack/q3widgetstack.pro
index 9783f585a9..1bd6a89e74 100644
--- a/tests/auto/q3widgetstack/q3widgetstack.pro
+++ b/tests/auto/q3widgetstack/q3widgetstack.pro
@@ -2,6 +2,7 @@ load(qttest_p4)
 SOURCES  += tst_q3widgetstack.cpp
 
 
-contains(QT_CONFIG, qt3support): QT += qt3support
+QT += qt3support
+requires(contains(QT_CONFIG,qt3support))