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

tests: fix private header inclusion in qtbase autotests

Browse Source 
Any test which needs private headers from some Qt module must do:

  QT += modulename-private

Reviewed-by: Jason McDonald
Change-Id: I6924a577a960e4990f4379b02bca4822d8248fb4
This commit is contained in:
Rohan McGovern 2011-05-11 14:02:54 +10:00
parent 838cf9abd9
commit fda40e37df
62 changed files with 132 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,4 @@
load(qttest_p4) load(qttest_p4)
QT += core-private
SOURCES += tst_languagechange.cpp SOURCES += tst_languagechange.cpp

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += gui-private
SOURCES += tst_nativeimagehandleprovider.cpp SOURCES += tst_nativeimagehandleprovider.cpp
symbian { symbian {
LIBS += -lfbscli -lbitgdi LIBS += -lfbscli -lbitgdi

2
tests/auto/qapplication/test/test.pro
View File

@ -1,5 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += ../tst_qapplication.cpp SOURCES += ../tst_qapplication.cpp
TARGET = ../tst_qapplication TARGET = ../tst_qapplication

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

@ -2,7 +2,7 @@ load(qttest_p4)
SOURCES += tst_qbytearray.cpp SOURCES += tst_qbytearray.cpp
QT = core QT = core core-private
wince*|symbian { wince*|symbian {
addFile.files = rfc3252.txt addFile.files = rfc3252.txt

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

@ -1,7 +1,7 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qchar.cpp SOURCES += tst_qchar.cpp
QT = core QT = core core-private
wince*|symbian: { wince*|symbian: {
deploy.files += NormalizationTest.txt deploy.files += NormalizationTest.txt

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

@ -1,4 +1,5 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qcomplextext.cpp SOURCES += tst_qcomplextext.cpp
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src

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

@ -1,7 +1,7 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qdatetime.cpp SOURCES += tst_qdatetime.cpp
QT = core QT = core core-private
# For some reason using optimization here triggers a compiler issue, which causes an exception # For some reason using optimization here triggers a compiler issue, which causes an exception
# However, the code is correct # However, the code is correct

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

@ -1,5 +1,5 @@
load(qttest_p4) load(qttest_p4)
QT = core QT = core core-private
contains(QT_CONFIG,dbus): { contains(QT_CONFIG,dbus): {
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered

3
tests/auto/qdbusabstractadaptor/test/test.pro
View File

@ -3,5 +3,4 @@ SOURCES += ../tst_qdbusabstractadaptor.cpp
HEADERS += ../myobject.h HEADERS += ../myobject.h
TARGET = ../tst_qdbusabstractadaptor TARGET = ../tst_qdbusabstractadaptor
QT = core QT = core core-private dbus
QT += dbus

3
tests/auto/qdbusinterface/test/test.pro
View File

@ -3,5 +3,4 @@ SOURCES += ../tst_qdbusinterface.cpp
HEADERS += ../myobject.h HEADERS += ../myobject.h
TARGET = ../tst_qdbusinterface TARGET = ../tst_qdbusinterface
QT = core QT = core core-private dbus
QT += dbus

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

@ -4,6 +4,8 @@ contains(QT_CONFIG,dbus): {
CONFIG += ordered CONFIG += ordered
SUBDIRS = qpong test SUBDIRS = qpong test
QT += core-private
requires(contains(QT_CONFIG,private_tests)) requires(contains(QT_CONFIG,private_tests))
} else { } else {
SOURCES += dummy.cpp SOURCES += dummy.cpp

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

@ -2,7 +2,7 @@ load(qttest_p4)
QT = core QT = core
contains(QT_CONFIG,dbus): { contains(QT_CONFIG,dbus): {
SOURCES += tst_qdbusmetaobject.cpp SOURCES += tst_qdbusmetaobject.cpp
QT += dbus QT += dbus dbus-private
} else { } else {
SOURCES += ../qdbusmarshall/dummy.cpp SOURCES += ../qdbusmarshall/dummy.cpp
} }

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

@ -1,8 +1,8 @@
load(qttest_p4) load(qttest_p4)
QT = core QT = core core-private
contains(QT_CONFIG,dbus): { contains(QT_CONFIG,dbus): {
SOURCES += tst_qdbustype.cpp SOURCES += tst_qdbustype.cpp
QT += dbus QT += dbus dbus-private
QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
LIBS_PRIVATE += $$QT_LIBS_DBUS LIBS_PRIVATE += $$QT_LIBS_DBUS
} else { } else {

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

@ -1,8 +1,8 @@
load(qttest_p4) load(qttest_p4)
QT = core QT = core core-private
contains(QT_CONFIG,dbus): { contains(QT_CONFIG,dbus): {
SOURCES += tst_qdbusxmlparser.cpp SOURCES += tst_qdbusxmlparser.cpp
QT += dbus QT += dbus dbus-private
} else { } else {
SOURCES += ../qdbusmarshall/dummy.cpp SOURCES += ../qdbusmarshall/dummy.cpp
} }

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qdockwidget.cpp SOURCES += tst_qdockwidget.cpp

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

@ -1,9 +1,7 @@
############################################################
# Project file for autotest for file qfiledialog.h
############################################################
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qfiledialog2.cpp SOURCES += tst_qfiledialog2.cpp
wince*|symbian { wince*|symbian {

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

@ -3,6 +3,6 @@ load(qttest_p4)
SOURCES += tst_qfilesystementry.cpp \ SOURCES += tst_qfilesystementry.cpp \
../../../src/corelib/io/qfilesystementry.cpp ../../../src/corelib/io/qfilesystementry.cpp
HEADERS += ../../../src/corelib/io/qfilesystementry_p.h HEADERS += ../../../src/corelib/io/qfilesystementry_p.h
QT = core QT = core core-private
CONFIG += parallel_test CONFIG += parallel_test

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qfontdialog.cpp SOURCES += tst_qfontdialog.cpp
mac { mac {

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

@ -2,7 +2,7 @@ load(qttest_p4)
SOURCES += tst_qftp.cpp SOURCES += tst_qftp.cpp
QT = core network QT = core network network-private
wince*: { wince*: {
addFiles.files = rfc3252.txt addFiles.files = rfc3252.txt

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

@ -1,5 +1,5 @@
load(qttest_p4) load(qttest_p4)
DEFINES += QT_STRICT_ITERATORS DEFINES += QT_STRICT_ITERATORS
SOURCES += tst_qfuture.cpp SOURCES += tst_qfuture.cpp
QT = core QT = core core-private
CONFIG += parallel_test CONFIG += parallel_test

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

@ -1,4 +1,4 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qfuturewatcher.cpp SOURCES += tst_qfuturewatcher.cpp
QT = core QT = core core-private
CONFIG += parallel_test CONFIG += parallel_test

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

@ -1,3 +1,6 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qgraphicseffect.cpp SOURCES += tst_qgraphicseffect.cpp
CONFIG += parallel_test CONFIG += parallel_test

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

@ -1,3 +1,6 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qgraphicseffectsource.cpp SOURCES += tst_qgraphicseffectsource.cpp
CONFIG += parallel_test CONFIG += parallel_test

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

@ -1,3 +1,6 @@
load(qttest_p4) load(qttest_p4)
QT += core-private
SOURCES += tst_qgraphicsobject.cpp SOURCES += tst_qgraphicsobject.cpp
CONFIG += parallel_test CONFIG += parallel_test

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qgraphicsproxywidget.cpp SOURCES += tst_qgraphicsproxywidget.cpp

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qgraphicsview.cpp tst_qgraphicsview_2.cpp SOURCES += tst_qgraphicsview.cpp tst_qgraphicsview_2.cpp
DEFINES += QT_NO_CAST_TO_ASCII DEFINES += QT_NO_CAST_TO_ASCII

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qgraphicswidget.cpp SOURCES += tst_qgraphicswidget.cpp

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qgridlayout.cpp SOURCES += tst_qgridlayout.cpp
FORMS += sortdialog.ui FORMS += sortdialog.ui

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qheaderview.cpp SOURCES += tst_qheaderview.cpp

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

@ -1,6 +1,8 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qimage.cpp SOURCES += tst_qimage.cpp
QT += core-private gui-private
wince*: { wince*: {
addImages.files = images/* addImages.files = images/*
addImages.path = images addImages.path = images

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

@ -1,7 +1,7 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qimagereader.cpp SOURCES += tst_qimagereader.cpp
MOC_DIR=tmp MOC_DIR=tmp
QT += network QT += core-private gui-private network
RESOURCES += qimagereader.qrc RESOURCES += qimagereader.qrc
!symbian:DEFINES += SRCDIR=\\\"$$PWD\\\" !symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qkeysequence.cpp SOURCES += tst_qkeysequence.cpp
RESOURCES += qkeysequence.qrc RESOURCES += qkeysequence.qrc

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qlabel.cpp SOURCES += tst_qlabel.cpp
wince*::DEFINES += SRCDIR=\\\"\\\" wince*::DEFINES += SRCDIR=\\\"\\\"
else:!symbian:DEFINES += SRCDIR=\\\"$$PWD/\\\" else:!symbian:DEFINES += SRCDIR=\\\"$$PWD/\\\"

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

@ -1,9 +1,7 @@
############################################################
# Project file for autotest for file qlayout.h
############################################################
load(qttest_p4) load(qttest_p4)
QT += gui-private
SOURCES += tst_qlayout.cpp SOURCES += tst_qlayout.cpp
contains(QT_CONFIG, qt3support): QT += qt3support contains(QT_CONFIG, qt3support): QT += qt3support
wince*|symbian: { wince*|symbian: {

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += gui-private
INCLUDEPATH += . INCLUDEPATH += .
SOURCES += tst_qmdiarea.cpp SOURCES += tst_qmdiarea.cpp
DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII

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

@ -1,5 +1,5 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qnetworkcookiejar.cpp SOURCES += tst_qnetworkcookiejar.cpp
QT = core network QT = core core-private network network-private
symbian: TARGET.CAPABILITY = NetworkServices symbian: TARGET.CAPABILITY = NetworkServices

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += gui-private
contains(QT_CONFIG, qt3support): QT += qt3support contains(QT_CONFIG, qt3support): QT += qt3support
SOURCES += tst_qpainter.cpp SOURCES += tst_qpainter.cpp
wince*|symbian: { wince*|symbian: {

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

@ -1,5 +1,5 @@
load(qttest_p4) load(qttest_p4)
QT = core gui QT = core core-private gui gui-private
SOURCES += tst_qpauseanimation.cpp SOURCES += tst_qpauseanimation.cpp

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qpixmap.cpp SOURCES += tst_qpixmap.cpp
contains(QT_CONFIG, qt3support): QT += qt3support contains(QT_CONFIG, qt3support): QT += qt3support
wince*|symbian: { wince*|symbian: {

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += gui-private
SOURCES += tst_qpixmapfilter.cpp SOURCES += tst_qpixmapfilter.cpp
wince*: { wince*: {

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

@ -1,5 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += gui-private
INCLUDEPATH += ../ INCLUDEPATH += ../
HEADERS += HEADERS +=

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

@ -1,5 +1,6 @@
load(qttest_p4) load(qttest_p4)
QT = core gui
QT = core core-private gui gui-private
SOURCES += \ SOURCES += \
tst_qrawfont.cpp tst_qrawfont.cpp

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += gui-private
SOURCES += tst_qregion.cpp SOURCES += tst_qregion.cpp

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

@ -1,7 +1,7 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qringbuffer.cpp SOURCES += tst_qringbuffer.cpp
QT = core QT = core core-private
CONFIG += parallel_test CONFIG += parallel_test

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private
SOURCES += tst_qsettings.cpp SOURCES += tst_qsettings.cpp
RESOURCES += qsettings.qrc RESOURCES += qsettings.qrc

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

@ -1,7 +1,7 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qsql.cpp SOURCES += tst_qsql.cpp
QT += sql QT += sql sql-private
contains(QT_CONFIG, qt3support): QT += qt3support contains(QT_CONFIG, qt3support): QT += qt3support

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qstandarditemmodel.cpp SOURCES += tst_qstandarditemmodel.cpp

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

@ -1,4 +1,4 @@
load(qttest_p4) load(qttest_p4)
QT = core gui QT = core core-private gui
SOURCES += tst_qstatemachine.cpp SOURCES += tst_qstatemachine.cpp

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

@ -1,4 +1,4 @@
load(qttest_p4) load(qttest_p4)
QT = core gui QT = core core-private gui gui-private
SOURCES += tst_qstatictext.cpp SOURCES += tst_qstatictext.cpp

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
TARGET.EPOCHEAPSIZE = 0x200000 0x800000 TARGET.EPOCHEAPSIZE = 0x200000 0x800000
SOURCES += tst_qtableview.cpp SOURCES += tst_qtableview.cpp

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

@ -1,5 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += gui-private
INCLUDEPATH += ../ INCLUDEPATH += ../
HEADERS += HEADERS +=

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += gui-private
SOURCES += tst_tessellator.cpp testtessellator.cpp oldtessellator.cpp utils.cpp simple.cpp dataparser.cpp arc.cpp SOURCES += tst_tessellator.cpp testtessellator.cpp oldtessellator.cpp utils.cpp simple.cpp dataparser.cpp arc.cpp
HEADERS += oldtessellator.h testtessellator.h utils.h XRenderFake.h simple.h qnum.h dataparser.h arc.h HEADERS += oldtessellator.h testtessellator.h utils.h XRenderFake.h simple.h qnum.h dataparser.h arc.h

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qtextblock.cpp SOURCES += tst_qtextblock.cpp

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

@ -1,5 +1,5 @@
load(qttest_p4) load(qttest_p4)
QT += xml QT += core-private gui-private xml
HEADERS += common.h HEADERS += common.h
SOURCES += tst_qtextdocument.cpp SOURCES += tst_qtextdocument.cpp

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qtextdocumentfragment.cpp SOURCES += tst_qtextdocumentfragment.cpp

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qtextlist.cpp SOURCES += tst_qtextlist.cpp
HEADERS += ../qtextdocument/common.h HEADERS += ../qtextdocument/common.h

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
HEADERS += HEADERS +=
SOURCES += tst_qtextscriptengine.cpp SOURCES += tst_qtextscriptengine.cpp
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += gui-private
SOURCES += tst_qvolatileimage.cpp SOURCES += tst_qvolatileimage.cpp
symbian { symbian {

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += core-private gui-private
SOURCES += tst_qwidget.cpp SOURCES += tst_qwidget.cpp
RESOURCES = qwidget.qrc RESOURCES = qwidget.qrc

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

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
QT += gui-private
SOURCES += tst_qwindowsurface.cpp SOURCES += tst_qwindowsurface.cpp

2
tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro
View File

@ -1,6 +1,6 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_benchlibtickcounter.cpp SOURCES += tst_benchlibtickcounter.cpp
QT = core QT = core testlib-private
mac:CONFIG -= app_bundle mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target CONFIG -= debug_and_release_target

2
tests/auto/selftests/test/test.pro
View File

@ -1,6 +1,6 @@
load(qttest_p4) load(qttest_p4)
SOURCES += ../tst_selftests.cpp SOURCES += ../tst_selftests.cpp
QT += core xml QT += core xml testlib-private
TARGET = ../tst_selftests TARGET = ../tst_selftests