From 173099696f44073441975febfa35ddfb3585e8c5 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Mon, 16 May 2011 10:43:14 +1000 Subject: 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 --- tests/auto/qiodevice/qiodevice.pro | 1 - 1 file changed, 1 deletion(-) (limited to 'tests/auto/qiodevice') 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 -- cgit v1.2.3