diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-16 10:43:14 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-16 13:10:00 +1000 |
commit | 173099696f44073441975febfa35ddfb3585e8c5 (patch) | |
tree | 21d2a9f36e66ea5bad370897d9e1bad5d89a26dc /tests/auto/qwidget | |
parent | 73e1f35fa39d64aa5f048df44382bd193f1aad44 (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/qwidget')
-rw-r--r-- | tests/auto/qwidget/qwidget.pro | 3 |
1 files changed, 0 insertions, 3 deletions
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 |