summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtcpsocket
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-05-16 10:43:14 +1000
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-05-16 13:10:00 +1000
commit173099696f44073441975febfa35ddfb3585e8c5 (patch)
tree21d2a9f36e66ea5bad370897d9e1bad5d89a26dc /tests/auto/qtcpsocket
parent73e1f35fa39d64aa5f048df44382bd193f1aad44 (diff)
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
Diffstat (limited to 'tests/auto/qtcpsocket')
-rw-r--r--tests/auto/qtcpsocket/stressTest/stressTest.pro1
1 files changed, 0 insertions, 1 deletions
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