tests: fix private header inclusion in qtbase autotests

Any test which needs private headers from some Qt module must do: QT += modulename-private Reviewed-by: Jason McDonald Change-Id: I6924a577a960e4990f4379b02bca4822d8248fb4
2011-05-11 14:02:54 +10:00 · 2011-05-11 14:02:54 +10:00 · fda40e37df
commit fda40e37df
parent 838cf9abd9
62 changed files with 132 additions and 38 deletions
--- a/tests/auto/languagechange/languagechange.pro
+++ b/tests/auto/languagechange/languagechange.pro
@ -1,3 +1,4 @@
 load(qttest_p4)
+QT += core-private
 SOURCES += tst_languagechange.cpp

--- a/tests/auto/nativeimagehandleprovider/nativeimagehandleprovider.pro
+++ b/tests/auto/nativeimagehandleprovider/nativeimagehandleprovider.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += gui-private
+
 SOURCES  += tst_nativeimagehandleprovider.cpp
 symbian {
    LIBS += -lfbscli -lbitgdi
--- a/tests/auto/qapplication/test/test.pro
+++ b/tests/auto/qapplication/test/test.pro
@ -1,5 +1,7 @@
 load(qttest_p4)

+QT += core-private gui-private
+
 SOURCES += ../tst_qapplication.cpp
 TARGET = ../tst_qapplication

--- a/tests/auto/qbytearray/qbytearray.pro
+++ b/tests/auto/qbytearray/qbytearray.pro
@ -2,7 +2,7 @@ load(qttest_p4)
 SOURCES  += tst_qbytearray.cpp


-QT = core
+QT = core core-private

 wince*|symbian {
   addFile.files = rfc3252.txt
--- a/tests/auto/qchar/qchar.pro
+++ b/tests/auto/qchar/qchar.pro
@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES  += tst_qchar.cpp

-QT = core
+QT = core core-private

 wince*|symbian: {
 deploy.files += NormalizationTest.txt
--- a/tests/auto/qcomplextext/qcomplextext.pro
+++ b/tests/auto/qcomplextext/qcomplextext.pro
@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += core-private gui-private
 SOURCES  += tst_qcomplextext.cpp
 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src

--- a/tests/auto/qdatetime/qdatetime.pro
+++ b/tests/auto/qdatetime/qdatetime.pro
@ -1,7 +1,7 @@
 load(qttest_p4)

 SOURCES += tst_qdatetime.cpp
-QT = core
+QT = core core-private

 # For some reason using optimization here triggers a compiler issue, which causes an exception
 # However, the code is correct
--- a/tests/auto/qdbusabstractadaptor/qdbusabstractadaptor.pro
+++ b/tests/auto/qdbusabstractadaptor/qdbusabstractadaptor.pro
@ -1,5 +1,5 @@
 load(qttest_p4)
-QT = core
+QT = core core-private
 contains(QT_CONFIG,dbus): {
    TEMPLATE = subdirs
    CONFIG += ordered
--- a/tests/auto/qdbusabstractadaptor/test/test.pro
+++ b/tests/auto/qdbusabstractadaptor/test/test.pro
@ -3,5 +3,4 @@ SOURCES += ../tst_qdbusabstractadaptor.cpp
 HEADERS += ../myobject.h
 TARGET = ../tst_qdbusabstractadaptor

-QT = core
-QT += dbus
+QT = core core-private dbus
--- a/tests/auto/qdbusinterface/test/test.pro
+++ b/tests/auto/qdbusinterface/test/test.pro
@ -3,5 +3,4 @@ SOURCES += ../tst_qdbusinterface.cpp
 HEADERS += ../myobject.h
 TARGET = ../tst_qdbusinterface

-QT = core
-QT += dbus
+QT = core core-private dbus
--- a/tests/auto/qdbusmarshall/qdbusmarshall.pro
+++ b/tests/auto/qdbusmarshall/qdbusmarshall.pro
@ -4,6 +4,8 @@ contains(QT_CONFIG,dbus): {
 	CONFIG += ordered
 	SUBDIRS = qpong test

+        QT += core-private
+
        requires(contains(QT_CONFIG,private_tests))
 } else {
 	SOURCES += dummy.cpp
--- a/tests/auto/qdbusmetaobject/qdbusmetaobject.pro
+++ b/tests/auto/qdbusmetaobject/qdbusmetaobject.pro
@ -2,7 +2,7 @@ load(qttest_p4)
 QT = core
 contains(QT_CONFIG,dbus): {
 	SOURCES += tst_qdbusmetaobject.cpp
-	QT += dbus
+	QT += dbus dbus-private
 } else {
 	SOURCES += ../qdbusmarshall/dummy.cpp
 }
--- a/tests/auto/qdbustype/qdbustype.pro
+++ b/tests/auto/qdbustype/qdbustype.pro
@ -1,8 +1,8 @@
 load(qttest_p4)
-QT = core
+QT = core core-private
 contains(QT_CONFIG,dbus): {
        SOURCES += tst_qdbustype.cpp
-        QT += dbus
+        QT += dbus dbus-private
        QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
        LIBS_PRIVATE += $$QT_LIBS_DBUS
 } else {
--- a/tests/auto/qdbusxmlparser/qdbusxmlparser.pro
+++ b/tests/auto/qdbusxmlparser/qdbusxmlparser.pro
@ -1,8 +1,8 @@
 load(qttest_p4)
-QT = core
+QT = core core-private
 contains(QT_CONFIG,dbus): {
 	SOURCES += tst_qdbusxmlparser.cpp
-	QT += dbus
+	QT += dbus dbus-private
 } else {
 	SOURCES += ../qdbusmarshall/dummy.cpp
 }
--- a/tests/auto/qdockwidget/qdockwidget.pro
+++ b/tests/auto/qdockwidget/qdockwidget.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 SOURCES += tst_qdockwidget.cpp


--- a/tests/auto/qfiledialog2/qfiledialog2.pro
+++ b/tests/auto/qfiledialog2/qfiledialog2.pro
@ -1,9 +1,7 @@
-############################################################
-# Project file for autotest for file qfiledialog.h
-############################################################
-
 load(qttest_p4)

+QT += core-private gui-private
+
 SOURCES += tst_qfiledialog2.cpp

 wince*|symbian {
--- a/tests/auto/qfilesystementry/qfilesystementry.pro
+++ b/tests/auto/qfilesystementry/qfilesystementry.pro
@ -3,6 +3,6 @@ load(qttest_p4)
 SOURCES   += tst_qfilesystementry.cpp \
    ../../../src/corelib/io/qfilesystementry.cpp
 HEADERS += ../../../src/corelib/io/qfilesystementry_p.h
-QT = core
+QT = core core-private

 CONFIG += parallel_test
--- a/tests/auto/qfontdialog/qfontdialog.pro
+++ b/tests/auto/qfontdialog/qfontdialog.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 SOURCES  += tst_qfontdialog.cpp

 mac {
--- a/tests/auto/qftp/qftp.pro
+++ b/tests/auto/qftp/qftp.pro
@ -2,7 +2,7 @@ load(qttest_p4)
 SOURCES  += tst_qftp.cpp


-QT = core network
+QT = core network network-private

 wince*: {
   addFiles.files = rfc3252.txt
--- a/tests/auto/qfuture/qfuture.pro
+++ b/tests/auto/qfuture/qfuture.pro
@ -1,5 +1,5 @@
 load(qttest_p4)
 DEFINES += QT_STRICT_ITERATORS
 SOURCES += tst_qfuture.cpp
-QT = core
+QT = core core-private
 CONFIG += parallel_test
--- a/tests/auto/qfuturewatcher/qfuturewatcher.pro
+++ b/tests/auto/qfuturewatcher/qfuturewatcher.pro
@ -1,4 +1,4 @@
 load(qttest_p4)
 SOURCES += tst_qfuturewatcher.cpp 
-QT = core
+QT = core core-private
 CONFIG += parallel_test
--- a/tests/auto/qgraphicseffect/qgraphicseffect.pro
+++ b/tests/auto/qgraphicseffect/qgraphicseffect.pro
@ -1,3 +1,6 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 SOURCES  += tst_qgraphicseffect.cpp
 CONFIG += parallel_test
--- a/tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro
+++ b/tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro
@ -1,3 +1,6 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 SOURCES  += tst_qgraphicseffectsource.cpp
 CONFIG += parallel_test
--- a/tests/auto/qgraphicsobject/qgraphicsobject.pro
+++ b/tests/auto/qgraphicsobject/qgraphicsobject.pro
@ -1,3 +1,6 @@
 load(qttest_p4)
+
+QT += core-private
+
 SOURCES  += tst_qgraphicsobject.cpp
-CONFIG += parallel_test
+CONFIG += parallel_test
--- a/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro
+++ b/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 SOURCES  += tst_qgraphicsproxywidget.cpp


--- a/tests/auto/qgraphicsview/qgraphicsview.pro
+++ b/tests/auto/qgraphicsview/qgraphicsview.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 SOURCES  += tst_qgraphicsview.cpp tst_qgraphicsview_2.cpp
 DEFINES += QT_NO_CAST_TO_ASCII

--- a/tests/auto/qgraphicswidget/qgraphicswidget.pro
+++ b/tests/auto/qgraphicswidget/qgraphicswidget.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 SOURCES  += tst_qgraphicswidget.cpp


--- a/tests/auto/qgridlayout/qgridlayout.pro
+++ b/tests/auto/qgridlayout/qgridlayout.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 SOURCES  += tst_qgridlayout.cpp
 FORMS           += sortdialog.ui

--- a/tests/auto/qheaderview/qheaderview.pro
+++ b/tests/auto/qheaderview/qheaderview.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 SOURCES  += tst_qheaderview.cpp


--- a/tests/auto/qimage/qimage.pro
+++ b/tests/auto/qimage/qimage.pro
@ -1,6 +1,8 @@
 load(qttest_p4)
 SOURCES  += tst_qimage.cpp

+QT += core-private gui-private
+
 wince*: {
   addImages.files = images/*
   addImages.path = images
--- a/tests/auto/qimagereader/qimagereader.pro
+++ b/tests/auto/qimagereader/qimagereader.pro
@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES += tst_qimagereader.cpp
 MOC_DIR=tmp
-QT += network
+QT += core-private gui-private network
 RESOURCES += qimagereader.qrc
 !symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"

--- a/tests/auto/qkeysequence/qkeysequence.pro
+++ b/tests/auto/qkeysequence/qkeysequence.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 SOURCES  += tst_qkeysequence.cpp

-RESOURCES += qkeysequence.qrc
+RESOURCES += qkeysequence.qrc
--- a/tests/auto/qlabel/qlabel.pro
+++ b/tests/auto/qlabel/qlabel.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 SOURCES += tst_qlabel.cpp
 wince*::DEFINES += SRCDIR=\\\"\\\"
 else:!symbian:DEFINES += SRCDIR=\\\"$$PWD/\\\"
--- a/tests/auto/qlayout/qlayout.pro
+++ b/tests/auto/qlayout/qlayout.pro
@ -1,9 +1,7 @@
-############################################################
-# Project file for autotest for file qlayout.h
-############################################################
-
 load(qttest_p4)

+QT += gui-private
+
 SOURCES += tst_qlayout.cpp
 contains(QT_CONFIG, qt3support): QT += qt3support
 wince*|symbian: {
--- a/tests/auto/qmdiarea/qmdiarea.pro
+++ b/tests/auto/qmdiarea/qmdiarea.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += gui-private
+
 INCLUDEPATH += .
 SOURCES += tst_qmdiarea.cpp
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
--- a/tests/auto/qnetworkcookiejar/qnetworkcookiejar.pro
+++ b/tests/auto/qnetworkcookiejar/qnetworkcookiejar.pro
@ -1,5 +1,5 @@
 load(qttest_p4)
 SOURCES  += tst_qnetworkcookiejar.cpp

-QT = core network
+QT = core core-private network network-private
 symbian: TARGET.CAPABILITY = NetworkServices
--- a/tests/auto/qpainter/qpainter.pro
+++ b/tests/auto/qpainter/qpainter.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += gui-private
+
 contains(QT_CONFIG, qt3support): QT += qt3support
 SOURCES  += tst_qpainter.cpp
 wince*|symbian: {
--- a/tests/auto/qpauseanimation/qpauseanimation.pro
+++ b/tests/auto/qpauseanimation/qpauseanimation.pro
@ -1,5 +1,5 @@
 load(qttest_p4)
-QT = core gui
+QT = core core-private gui gui-private
 SOURCES  += tst_qpauseanimation.cpp


--- a/tests/auto/qpixmap/qpixmap.pro
+++ b/tests/auto/qpixmap/qpixmap.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 SOURCES  += tst_qpixmap.cpp
 contains(QT_CONFIG, qt3support): QT += qt3support
 wince*|symbian: {
--- a/tests/auto/qpixmapfilter/qpixmapfilter.pro
+++ b/tests/auto/qpixmapfilter/qpixmapfilter.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += gui-private
+
 SOURCES  += tst_qpixmapfilter.cpp

 wince*: {
--- a/tests/auto/qplaintextedit/qplaintextedit.pro
+++ b/tests/auto/qplaintextedit/qplaintextedit.pro
@ -1,5 +1,7 @@
 load(qttest_p4)

+QT += gui-private
+
 INCLUDEPATH += ../

 HEADERS +=  
--- a/tests/auto/qrawfont/qrawfont.pro
+++ b/tests/auto/qrawfont/qrawfont.pro
@ -1,5 +1,6 @@
 load(qttest_p4)
-QT = core gui
+
+QT = core core-private gui gui-private

 SOURCES += \
    tst_qrawfont.cpp
--- a/tests/auto/qregion/qregion.pro
+++ b/tests/auto/qregion/qregion.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += gui-private
+
 SOURCES  += tst_qregion.cpp


--- a/tests/auto/qringbuffer/qringbuffer.pro
+++ b/tests/auto/qringbuffer/qringbuffer.pro
@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES  += tst_qringbuffer.cpp

-QT = core
+QT = core core-private


 CONFIG += parallel_test
--- a/tests/auto/qsettings/qsettings.pro
+++ b/tests/auto/qsettings/qsettings.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private
+
 SOURCES  += tst_qsettings.cpp
 RESOURCES += qsettings.qrc

--- a/tests/auto/qsql/qsql.pro
+++ b/tests/auto/qsql/qsql.pro
@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES  += tst_qsql.cpp

-QT += sql
+QT += sql sql-private

 contains(QT_CONFIG, qt3support): QT += qt3support

--- a/tests/auto/qstandarditemmodel/qstandarditemmodel.pro
+++ b/tests/auto/qstandarditemmodel/qstandarditemmodel.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 SOURCES  += tst_qstandarditemmodel.cpp


--- a/tests/auto/qstatemachine/qstatemachine.pro
+++ b/tests/auto/qstatemachine/qstatemachine.pro
@ -1,4 +1,4 @@
 load(qttest_p4)
-QT = core gui
+QT = core core-private gui
 SOURCES  += tst_qstatemachine.cpp

--- a/tests/auto/qstatictext/qstatictext.pro
+++ b/tests/auto/qstatictext/qstatictext.pro
@ -1,4 +1,4 @@
 load(qttest_p4)
-QT = core gui
+QT = core core-private gui gui-private
 SOURCES  += tst_qstatictext.cpp

--- a/tests/auto/qtableview/qtableview.pro
+++ b/tests/auto/qtableview/qtableview.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 TARGET.EPOCHEAPSIZE = 0x200000 0x800000
 SOURCES  += tst_qtableview.cpp

--- a/tests/auto/qtabwidget/qtabwidget.pro
+++ b/tests/auto/qtabwidget/qtabwidget.pro
@ -1,5 +1,7 @@
 load(qttest_p4)

+QT += gui-private
+
 INCLUDEPATH += ../

 HEADERS +=  
--- a/tests/auto/qtessellator/qtessellator.pro
+++ b/tests/auto/qtessellator/qtessellator.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += gui-private
+
 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

--- a/tests/auto/qtextblock/qtextblock.pro
+++ b/tests/auto/qtextblock/qtextblock.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 SOURCES  += tst_qtextblock.cpp


--- a/tests/auto/qtextdocument/qtextdocument.pro
+++ b/tests/auto/qtextdocument/qtextdocument.pro
@ -1,5 +1,5 @@
 load(qttest_p4)
-QT += xml
+QT += core-private gui-private xml
 HEADERS += common.h
 SOURCES += tst_qtextdocument.cpp 

--- a/tests/auto/qtextdocumentfragment/qtextdocumentfragment.pro
+++ b/tests/auto/qtextdocumentfragment/qtextdocumentfragment.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 SOURCES  += tst_qtextdocumentfragment.cpp


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

--- a/tests/auto/qtextscriptengine/qtextscriptengine.pro
+++ b/tests/auto/qtextscriptengine/qtextscriptengine.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 HEADERS += 
 SOURCES += tst_qtextscriptengine.cpp 
 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
--- a/tests/auto/qvolatileimage/qvolatileimage.pro
+++ b/tests/auto/qvolatileimage/qvolatileimage.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += gui-private
+
 SOURCES  += tst_qvolatileimage.cpp

 symbian {
--- a/tests/auto/qwidget/qwidget.pro
+++ b/tests/auto/qwidget/qwidget.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 SOURCES  += tst_qwidget.cpp
 RESOURCES     = qwidget.qrc

--- a/tests/auto/qwindowsurface/qwindowsurface.pro
+++ b/tests/auto/qwindowsurface/qwindowsurface.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += gui-private
+
 SOURCES += tst_qwindowsurface.cpp


--- a/tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro
+++ b/tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro
@ -1,6 +1,6 @@
 load(qttest_p4)
 SOURCES += tst_benchlibtickcounter.cpp
-QT = core
+QT = core testlib-private

 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
--- a/tests/auto/selftests/test/test.pro
+++ b/tests/auto/selftests/test/test.pro
@ -1,6 +1,6 @@
 load(qttest_p4)
 SOURCES += ../tst_selftests.cpp
-QT += core xml
+QT += core xml testlib-private

 TARGET = ../tst_selftests