1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: clean up usage of QT_CONFIG to fix circular dependencies

Browse Source 
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
This commit is contained in:
Rohan McGovern 2011-05-16 10:43:14 +10:00
parent 73e1f35fa3
commit 173099696f
37 changed files with 2 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/atwrapper/atWrapper.pro
View File

@ -9,7 +9,6 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
QT += xml svg network QT += xml svg network
contains(QT_CONFIG, qt3support): QT += qt3support
contains(QT_CONFIG, opengl):QT += opengl contains(QT_CONFIG, opengl):QT += opengl
include($$ARTHUR/datagenerator/datagenerator.pri) include($$ARTHUR/datagenerator/datagenerator.pri)

2
tests/auto/host.pro
View File

@ -10,5 +10,3 @@ SUBDIRS=\
#atwrapper \ # These tests need significant updating, #atwrapper \ # These tests need significant updating,
#uiloader \ # they have hardcoded machine names etc. #uiloader \ # they have hardcoded machine names etc.
#contains(QT_CONFIG,qt3support):SUBDIRS+=uic3

2
tests/auto/moc/moc.pro
View File

@ -21,8 +21,6 @@ if(*-g++*|*-icc*|*-clang|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h win
SOURCES += tst_moc.cpp SOURCES += tst_moc.cpp
QT += sql network QT += sql network
contains(QT_CONFIG, script): QT += script
contains(QT_CONFIG, qt3support): QT += qt3support
contains(QT_CONFIG, dbus){ contains(QT_CONFIG, dbus){
DEFINES += WITH_DBUS DEFINES += WITH_DBUS
QT += dbus QT += dbus

3
tests/auto/qaccessibility/qaccessibility.pro
View File

@ -2,10 +2,9 @@ load(qttest_p4)
SOURCES += tst_qaccessibility.cpp SOURCES += tst_qaccessibility.cpp
unix:!mac:LIBS+=-lm unix:!mac:LIBS+=-lm
contains(QT_CONFIG, qt3support): QT += qt3support
wince*: { wince*: {
accessneeded.files = $$QT_BUILD_TREE\\plugins\\accessible\\*.dll accessneeded.files = $$QT_BUILD_TREE\\plugins\\accessible\\*.dll
accessneeded.path = accessible accessneeded.path = accessible
DEPLOYMENT += accessneeded DEPLOYMENT += accessneeded
} }

1
tests/auto/qalgorithms/qalgorithms.pro
View File

@ -2,4 +2,3 @@ load(qttest_p4)
SOURCES += tst_qalgorithms.cpp SOURCES += tst_qalgorithms.cpp
QT = core QT = core
contains(QT_CONFIG, qt3support): QT += qt3support

1
tests/auto/qcombobox/qcombobox.pro
View File

@ -1,4 +1,3 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qcombobox.cpp SOURCES += tst_qcombobox.cpp
contains(QT_CONFIG, qt3support): QT += qt3support

1
tests/auto/qdatastream/qdatastream.pro
View File

@ -7,7 +7,6 @@ else: DEFINES += SVGFILE=\\\"gearflowers.svg\\\"
} }
# for qpaintdevicemetrics.h # for qpaintdevicemetrics.h
contains(QT_CONFIG, qt3support):QT += qt3support
QT += svg QT += svg

1
tests/auto/qdir/qdir.pro
View File

@ -18,7 +18,6 @@ wince* {
LIBS += -lefsrv LIBS += -lefsrv
INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
} else { } else {
contains(QT_CONFIG, qt3support):QT += qt3support
DEFINES += SRCDIR=\\\"$$PWD/\\\" DEFINES += SRCDIR=\\\"$$PWD/\\\"
} }

2
tests/auto/qfileinfo/qfileinfo.pro
View File

@ -30,6 +30,4 @@ wince* {
DEFINES += SRCDIR=\\\"$$PWD/\\\" DEFINES += SRCDIR=\\\"$$PWD/\\\"
} }
contains(QT_CONFIG, qt3support): QT += qt3support
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/qfocusevent/qfocusevent.pro
View File

@ -1,6 +1,2 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qfocusevent.cpp SOURCES += tst_qfocusevent.cpp
contains(QT_CONFIG, qt3support): QT += qt3support

1
tests/auto/qimage/qimage.pro
View File

@ -19,6 +19,5 @@ wince*: {
DEPLOYMENT += imagePlugins DEPLOYMENT += imagePlugins
} }
} else { } else {
contains(QT_CONFIG, qt3support): QT += qt3support
DEFINES += SRCDIR=\\\"$$PWD\\\" DEFINES += SRCDIR=\\\"$$PWD\\\"
} }

2
tests/auto/qinputcontext/qinputcontext.pro
View File

@ -1,8 +1,6 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qinputcontext.cpp SOURCES += tst_qinputcontext.cpp
contains(QT_CONFIG, webkit):QT += webkit
symbian { symbian {
LIBS += -lws32 -lcone LIBS += -lws32 -lcone
} }

1
tests/auto/qiodevice/qiodevice.pro
View File

@ -17,7 +17,6 @@ wince*: {
TARGET.CAPABILITY = NetworkServices TARGET.CAPABILITY = NetworkServices
} else { } else {
DEFINES += SRCDIR=\\\"$$PWD/\\\" DEFINES += SRCDIR=\\\"$$PWD/\\\"
contains(QT_CONFIG, qt3support):QT += qt3support
} }
MOC_DIR=tmp MOC_DIR=tmp

1
tests/auto/qlayout/qlayout.pro
View File

@ -3,7 +3,6 @@ load(qttest_p4)
QT += gui-private QT += gui-private
SOURCES += tst_qlayout.cpp SOURCES += tst_qlayout.cpp
contains(QT_CONFIG, qt3support): QT += qt3support
wince*|symbian: { wince*|symbian: {
addFiles.files = baseline addFiles.files = baseline
addFiles.path = . addFiles.path = .

4
tests/auto/qlineedit/qlineedit.pro
View File

@ -1,6 +1,2 @@
load(qttest_p4) load(qttest_p4)
contains(QT_CONFIG,qt3support) QT += qt3support
SOURCES += tst_qlineedit.cpp SOURCES += tst_qlineedit.cpp

2
tests/auto/qlocalsocket/lackey/lackey.pro
View File

@ -17,4 +17,4 @@ DEFINES += QLOCALSOCKET_DEBUG
SOURCES += main.cpp SOURCES += main.cpp
TARGET = lackey TARGET = lackey
symbian:TARGET.CAPABILITY = ALL -TCB symbian:TARGET.CAPABILITY = ALL -TCB

5
tests/auto/qmenu/qmenu.pro
View File

@ -1,7 +1,2 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qmenu.cpp SOURCES += tst_qmenu.cpp
contains(QT_CONFIG, qt3support): QT += qt3support

4
tests/auto/qmenubar/qmenubar.pro
View File

@ -1,6 +1,2 @@
load(qttest_p4) load(qttest_p4)
HEADERS +=
SOURCES += tst_qmenubar.cpp SOURCES += tst_qmenubar.cpp
contains(QT_CONFIG, qt3support):!symbian:QT += qt3support

3
tests/auto/qmouseevent/qmouseevent.pro
View File

@ -1,5 +1,2 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qmouseevent.cpp SOURCES += tst_qmouseevent.cpp
contains(QT_CONFIG, qt3support): QT += qt3support

1
tests/auto/qobject/tst_qobject.pro
View File

@ -8,7 +8,6 @@ SOURCES += moc_oldnormalizeobject.cpp
QT = core \ QT = core \
network \ network \
gui gui
contains(QT_CONFIG, qt3support):DEFINES += QT_HAS_QT3SUPPORT
wince*: { wince*: {
addFiles.files = signalbug.exe addFiles.files = signalbug.exe
addFiles.path = . addFiles.path = .

1
tests/auto/qpainter/qpainter.pro
View File

@ -2,7 +2,6 @@ load(qttest_p4)
QT += gui-private QT += gui-private
contains(QT_CONFIG, qt3support): QT += qt3support
SOURCES += tst_qpainter.cpp SOURCES += tst_qpainter.cpp
wince*|symbian: { wince*|symbian: {
addFiles.files = drawEllipse drawLine_rop_bitmap drawPixmap_rop drawPixmap_rop_bitmap task217400.png addFiles.files = drawEllipse drawLine_rop_bitmap drawPixmap_rop drawPixmap_rop_bitmap task217400.png

1
tests/auto/qpixmap/qpixmap.pro
View File

@ -3,7 +3,6 @@ load(qttest_p4)
QT += core-private gui-private QT += core-private gui-private
SOURCES += tst_qpixmap.cpp SOURCES += tst_qpixmap.cpp
contains(QT_CONFIG, qt3support): QT += qt3support
wince*|symbian: { wince*|symbian: {
task31722_0.files = convertFromImage/task31722_0/*.png task31722_0.files = convertFromImage/task31722_0/*.png

6
tests/auto/qprinter/qprinter.pro
View File

@ -1,8 +1,2 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qprinter.cpp SOURCES += tst_qprinter.cpp
contains(QT_CONFIG, qt3support): QT += qt3support

1
tests/auto/qsettings/qsettings.pro
View File

@ -5,7 +5,6 @@ QT += core-private
SOURCES += tst_qsettings.cpp SOURCES += tst_qsettings.cpp
RESOURCES += qsettings.qrc RESOURCES += qsettings.qrc
contains(QT_CONFIG, qt3support):QT += qt3support
CONFIG -= debug CONFIG -= debug
CONFIG += release CONFIG += release
win32-msvc*:LIBS += advapi32.lib win32-msvc*:LIBS += advapi32.lib

2
tests/auto/qsplitter/qsplitter.pro
View File

@ -2,8 +2,6 @@ load(qttest_p4)
SOURCES += tst_qsplitter.cpp SOURCES += tst_qsplitter.cpp
contains(QT_CONFIG, qt3support): QT += qt3support
wince*|symbian: { wince*|symbian: {
addFiles.files = extradata.txt setSizes3.dat addFiles.files = extradata.txt setSizes3.dat
addFiles.path = . addFiles.path = .

2
tests/auto/qsql/qsql.pro
View File

@ -3,8 +3,6 @@ SOURCES += tst_qsql.cpp
QT += sql sql-private QT += sql sql-private
contains(QT_CONFIG, qt3support): QT += qt3support
wince*: { wince*: {
DEPLOYMENT_PLUGIN += qsqlite DEPLOYMENT_PLUGIN += qsqlite
} }

2
tests/auto/qsqldatabase/qsqldatabase.pro
View File

@ -3,8 +3,6 @@ SOURCES += tst_qsqldatabase.cpp
QT += sql QT += sql
contains(QT_CONFIG, qt3support): QT += qt3support
win32: { win32: {
!wince*: LIBS += -lws2_32 !wince*: LIBS += -lws2_32
else: LIBS += -lws2 else: LIBS += -lws2

1
tests/auto/qtabwidget/qtabwidget.pro
View File

@ -6,7 +6,6 @@ INCLUDEPATH += ../
HEADERS += HEADERS +=
SOURCES += tst_qtabwidget.cpp SOURCES += tst_qtabwidget.cpp
contains(QT_CONFIG, qt3support): QT += qt3support
win32:!wince*:LIBS += -luser32 win32:!wince*:LIBS += -luser32

1
tests/auto/qtcpsocket/stressTest/stressTest.pro
View File

@ -1,7 +1,6 @@
HEADERS += Test.h HEADERS += Test.h
SOURCES += main.cpp Test.cpp SOURCES += main.cpp Test.cpp
QT += network QT += network
contains(QT_CONFIG, qt3support): QT += qt3support
CONFIG -= app_bundle CONFIG -= app_bundle
CONFIG += console CONFIG += console

2
tests/auto/qtextbrowser/qtextbrowser.pro
View File

@ -2,8 +2,6 @@ load(qttest_p4)
SOURCES += tst_qtextbrowser.cpp SOURCES += tst_qtextbrowser.cpp
!symbian:DEFINES += SRCDIR=\\\"$$PWD\\\" !symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
contains(QT_CONFIG, qt3support): QT += qt3support
wince*|symbian: { wince*|symbian: {
addFiles.files = *.html addFiles.files = *.html

2
tests/auto/qtextedit/qtextedit.pro
View File

@ -16,5 +16,3 @@ wince* {
} else:!symbian { } else:!symbian {
DEFINES += SRCDIR=\\\"$$PWD/\\\" DEFINES += SRCDIR=\\\"$$PWD/\\\"
} }
contains(QT_CONFIG, qt3support): QT += qt3support

1
tests/auto/qtextstream/test/test.pro
View File

@ -13,7 +13,6 @@ win32 {
RESOURCES += ../qtextstream.qrc RESOURCES += ../qtextstream.qrc
contains(QT_CONFIG, qt3support):QT += qt3support
QT = core network QT = core network

9
tests/auto/qtoolbutton/qtoolbutton.pro
View File

@ -1,11 +1,2 @@
############################################################
# Project file for autotest for file qtoolbutton.h
############################################################
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qtoolbutton.cpp SOURCES += tst_qtoolbutton.cpp
contains(QT_CONFIG, qt3support): QT += qt3support

2
tests/auto/qvariant/qvariant.pro
View File

@ -1,5 +1,3 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qvariant.cpp SOURCES += tst_qvariant.cpp
QT += network QT += network
contains(QT_CONFIG, qt3support): QT += qt3support

3
tests/auto/qwidget/qwidget.pro
View File

@ -5,9 +5,6 @@ QT += core-private gui-private
SOURCES += tst_qwidget.cpp SOURCES += tst_qwidget.cpp
RESOURCES = qwidget.qrc RESOURCES = qwidget.qrc
contains(QT_CONFIG, qt3support): QT += qt3support
contains(QT_CONFIG, qt3support):DEFINES+=QT_HAS_QT3SUPPORT
aix-g++*:QMAKE_CXXFLAGS+=-fpermissive aix-g++*:QMAKE_CXXFLAGS+=-fpermissive
CONFIG += x11inc CONFIG += x11inc

4
tests/auto/qworkspace/qworkspace.pro
View File

@ -1,6 +1,2 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qworkspace.cpp SOURCES += tst_qworkspace.cpp
contains(QT_CONFIG, qt3support): QT += qt3support

1
tests/auto/uiloader/uiloader/uiloader.pro
View File

@ -14,7 +14,6 @@ win32 {
} }
QT += xml svg network QT += xml svg network
contains(QT_CONFIG, qt3support): QT += qt3support
wince*|symbian: { wince*|symbian: {
configuration.files = ../*.ini configuration.files = ../*.ini