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

62 files changed, 132 insertions, 38 deletions

diff --git a/tests/auto/languagechange/languagechange.pro b/tests/auto/languagechange/languagechange.pro
index 1a1d91e90a..f161c50864 100644
--- 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
 
diff --git a/tests/auto/nativeimagehandleprovider/nativeimagehandleprovider.pro b/tests/auto/nativeimagehandleprovider/nativeimagehandleprovider.pro
index fb8ecb0042..70ea53c369 100644
--- 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
diff --git a/tests/auto/qapplication/test/test.pro b/tests/auto/qapplication/test/test.pro
index 73799f4e2b..adda481829 100644
--- 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
 
diff --git a/tests/auto/qbytearray/qbytearray.pro b/tests/auto/qbytearray/qbytearray.pro
index f195dc8c71..2c58db6b84 100644
--- 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
diff --git a/tests/auto/qchar/qchar.pro b/tests/auto/qchar/qchar.pro
index 1681220117..154c37e1af 100644
--- 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
diff --git a/tests/auto/qcomplextext/qcomplextext.pro b/tests/auto/qcomplextext/qcomplextext.pro
index 9c64b40241..bd85daa6b4 100644
--- 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
 
diff --git a/tests/auto/qdatetime/qdatetime.pro b/tests/auto/qdatetime/qdatetime.pro
index 08a321ef75..cd335826ec 100644
--- 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
diff --git a/tests/auto/qdbusabstractadaptor/qdbusabstractadaptor.pro b/tests/auto/qdbusabstractadaptor/qdbusabstractadaptor.pro
index c3e3f7f503..480509853f 100644
--- 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
diff --git a/tests/auto/qdbusabstractadaptor/test/test.pro b/tests/auto/qdbusabstractadaptor/test/test.pro
index 014a9e81f6..52aa578fd4 100644
--- 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
diff --git a/tests/auto/qdbusinterface/test/test.pro b/tests/auto/qdbusinterface/test/test.pro
index 3252188b6e..2ef7a89c56 100644
--- 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
diff --git a/tests/auto/qdbusmarshall/qdbusmarshall.pro b/tests/auto/qdbusmarshall/qdbusmarshall.pro
index ad40c0d0b2..1b6408a2f9 100644
--- 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
diff --git a/tests/auto/qdbusmetaobject/qdbusmetaobject.pro b/tests/auto/qdbusmetaobject/qdbusmetaobject.pro
index c7b5eacaf0..fa59c06c8e 100644
--- 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
 }
diff --git a/tests/auto/qdbustype/qdbustype.pro b/tests/auto/qdbustype/qdbustype.pro
index e2f0c9017c..9b6808b562 100644
--- 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 {
diff --git a/tests/auto/qdbusxmlparser/qdbusxmlparser.pro b/tests/auto/qdbusxmlparser/qdbusxmlparser.pro
index e8fd4c7722..0ac0d9e198 100644
--- 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
 }
diff --git a/tests/auto/qdockwidget/qdockwidget.pro b/tests/auto/qdockwidget/qdockwidget.pro
index 14963720dd..5f92e5db19 100644
--- 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
 
 
diff --git a/tests/auto/qfiledialog2/qfiledialog2.pro b/tests/auto/qfiledialog2/qfiledialog2.pro
index b8924c161b..5d1d72195d 100644
--- 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 {
diff --git a/tests/auto/qfilesystementry/qfilesystementry.pro b/tests/auto/qfilesystementry/qfilesystementry.pro
index b9b43e6a9f..31f0064bd1 100644
--- 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
diff --git a/tests/auto/qfontdialog/qfontdialog.pro b/tests/auto/qfontdialog/qfontdialog.pro
index 8a4485d94f..637e896518 100644
--- 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 {
diff --git a/tests/auto/qftp/qftp.pro b/tests/auto/qftp/qftp.pro
index ac1702e715..69f89572ba 100644
--- 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
diff --git a/tests/auto/qfuture/qfuture.pro b/tests/auto/qfuture/qfuture.pro
index d6faae716c..0e74f47678 100644
--- 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
diff --git a/tests/auto/qfuturewatcher/qfuturewatcher.pro b/tests/auto/qfuturewatcher/qfuturewatcher.pro
index 67f04ef0e5..9de37d014f 100644
--- 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
diff --git a/tests/auto/qgraphicseffect/qgraphicseffect.pro b/tests/auto/qgraphicseffect/qgraphicseffect.pro
index 94b3ce619e..963eca25c4 100644
--- 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
diff --git a/tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro b/tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro
index 5658ad7851..da437e959c 100644
--- 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
diff --git a/tests/auto/qgraphicsobject/qgraphicsobject.pro b/tests/auto/qgraphicsobject/qgraphicsobject.pro
index 2418845b73..648a81f6c6 100644
--- 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
\ No newline at end of file
+CONFIG += parallel_test
diff --git a/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro b/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro
index 08d7b1ab91..7217008317 100644
--- 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
 
 
diff --git a/tests/auto/qgraphicsview/qgraphicsview.pro b/tests/auto/qgraphicsview/qgraphicsview.pro
index 5e7e53da6e..4d80caebaf 100644
--- 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
 
diff --git a/tests/auto/qgraphicswidget/qgraphicswidget.pro b/tests/auto/qgraphicswidget/qgraphicswidget.pro
index ae61c2abca..4f568eefda 100644
--- 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
 
 
diff --git a/tests/auto/qgridlayout/qgridlayout.pro b/tests/auto/qgridlayout/qgridlayout.pro
index 00cc5eede7..d034f1d031 100644
--- 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
 
diff --git a/tests/auto/qheaderview/qheaderview.pro b/tests/auto/qheaderview/qheaderview.pro
index 3436d4fc20..9910e4e89d 100644
--- 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
 
 
diff --git a/tests/auto/qimage/qimage.pro b/tests/auto/qimage/qimage.pro
index 798c82ea2d..f845ad7b1c 100644
--- 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
diff --git a/tests/auto/qimagereader/qimagereader.pro b/tests/auto/qimagereader/qimagereader.pro
index 827819dea5..bf77fb7a2e 100644
--- 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\\\"
 
diff --git a/tests/auto/qkeysequence/qkeysequence.pro b/tests/auto/qkeysequence/qkeysequence.pro
index bd85402e31..720c53d627 100644
--- 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
\ No newline at end of file
+RESOURCES += qkeysequence.qrc
diff --git a/tests/auto/qlabel/qlabel.pro b/tests/auto/qlabel/qlabel.pro
index 057a6f1509..4b510cca52 100644
--- 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/\\\"
diff --git a/tests/auto/qlayout/qlayout.pro b/tests/auto/qlayout/qlayout.pro
index bb1ae4a322..3fbc580d5c 100644
--- 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: {
diff --git a/tests/auto/qmdiarea/qmdiarea.pro b/tests/auto/qmdiarea/qmdiarea.pro
index 3b81c9e011..a84eeab45d 100644
--- 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
diff --git a/tests/auto/qnetworkcookiejar/qnetworkcookiejar.pro b/tests/auto/qnetworkcookiejar/qnetworkcookiejar.pro
index 6d75fab758..4e5f01745a 100644
--- 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
diff --git a/tests/auto/qpainter/qpainter.pro b/tests/auto/qpainter/qpainter.pro
index ee624e1ef6..2db6ff381e 100644
--- 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: {
diff --git a/tests/auto/qpauseanimation/qpauseanimation.pro b/tests/auto/qpauseanimation/qpauseanimation.pro
index 4599cf0fb5..7f612b69fe 100644
--- 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
 
 
diff --git a/tests/auto/qpixmap/qpixmap.pro b/tests/auto/qpixmap/qpixmap.pro
index e73c130827..9f8e2f4166 100644
--- 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: {
diff --git a/tests/auto/qpixmapfilter/qpixmapfilter.pro b/tests/auto/qpixmapfilter/qpixmapfilter.pro
index 964e56d6f3..d52a3c39a3 100644
--- 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*: {
diff --git a/tests/auto/qplaintextedit/qplaintextedit.pro b/tests/auto/qplaintextedit/qplaintextedit.pro
index f3d359dd47..fef1ac83aa 100644
--- a/tests/auto/qplaintextedit/qplaintextedit.pro
+++ b/tests/auto/qplaintextedit/qplaintextedit.pro
@@ -1,5 +1,7 @@
 load(qttest_p4)
 
+QT += gui-private
+
 INCLUDEPATH += ../
 
 HEADERS +=  
diff --git a/tests/auto/qrawfont/qrawfont.pro b/tests/auto/qrawfont/qrawfont.pro
index ccdccfb0eb..1f73055b00 100644
--- 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
diff --git a/tests/auto/qregion/qregion.pro b/tests/auto/qregion/qregion.pro
index b264d351b0..8dbb4844a0 100644
--- 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
 
 
diff --git a/tests/auto/qringbuffer/qringbuffer.pro b/tests/auto/qringbuffer/qringbuffer.pro
index 2e4f166619..dc572d0633 100644
--- 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
diff --git a/tests/auto/qsettings/qsettings.pro b/tests/auto/qsettings/qsettings.pro
index fe104dfaa9..151660d21c 100644
--- 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
 
diff --git a/tests/auto/qsql/qsql.pro b/tests/auto/qsql/qsql.pro
index 9bf30f8055..6d132f5b68 100644
--- 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
 
diff --git a/tests/auto/qstandarditemmodel/qstandarditemmodel.pro b/tests/auto/qstandarditemmodel/qstandarditemmodel.pro
index cc622e2e74..0fc47b3624 100644
--- 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
 
 
diff --git a/tests/auto/qstatemachine/qstatemachine.pro b/tests/auto/qstatemachine/qstatemachine.pro
index e5b32b570a..ab71202f18 100644
--- 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
 
diff --git a/tests/auto/qstatictext/qstatictext.pro b/tests/auto/qstatictext/qstatictext.pro
index 0f1ca68595..0c16c4c149 100644
--- 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
 
diff --git a/tests/auto/qtableview/qtableview.pro b/tests/auto/qtableview/qtableview.pro
index 72099d45c2..16284b23b4 100644
--- 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
 
diff --git a/tests/auto/qtabwidget/qtabwidget.pro b/tests/auto/qtabwidget/qtabwidget.pro
index 0c2fc66981..37aec5fc2a 100644
--- a/tests/auto/qtabwidget/qtabwidget.pro
+++ b/tests/auto/qtabwidget/qtabwidget.pro
@@ -1,5 +1,7 @@
 load(qttest_p4)
 
+QT += gui-private
+
 INCLUDEPATH += ../
 
 HEADERS +=  
diff --git a/tests/auto/qtessellator/qtessellator.pro b/tests/auto/qtessellator/qtessellator.pro
index e043a4dc8b..6821d0e909 100644
--- 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
 
diff --git a/tests/auto/qtextblock/qtextblock.pro b/tests/auto/qtextblock/qtextblock.pro
index 14a705f910..5558a71506 100644
--- 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
 
 
diff --git a/tests/auto/qtextdocument/qtextdocument.pro b/tests/auto/qtextdocument/qtextdocument.pro
index 1e44a9c1b4..69517589cc 100644
--- 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 
 
diff --git a/tests/auto/qtextdocumentfragment/qtextdocumentfragment.pro b/tests/auto/qtextdocumentfragment/qtextdocumentfragment.pro
index 5df193788e..e6ddd45f85 100644
--- 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
 
 
diff --git a/tests/auto/qtextlist/qtextlist.pro b/tests/auto/qtextlist/qtextlist.pro
index 846350bc49..f66fb96dd0 100644
--- 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
 
diff --git a/tests/auto/qtextscriptengine/qtextscriptengine.pro b/tests/auto/qtextscriptengine/qtextscriptengine.pro
index 128b9afb9a..e40ddff777 100644
--- 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
diff --git a/tests/auto/qvolatileimage/qvolatileimage.pro b/tests/auto/qvolatileimage/qvolatileimage.pro
index 5a0a613ffa..4be93896c4 100644
--- 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 {
diff --git a/tests/auto/qwidget/qwidget.pro b/tests/auto/qwidget/qwidget.pro
index e39431b9b4..fbbed3d8fa 100644
--- 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
 
diff --git a/tests/auto/qwindowsurface/qwindowsurface.pro b/tests/auto/qwindowsurface/qwindowsurface.pro
index e5686beb6a..f236793b91 100644
--- 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
 
 
diff --git a/tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro b/tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro
index 3621449862..4f7f141a58 100644
--- 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
diff --git a/tests/auto/selftests/test/test.pro b/tests/auto/selftests/test/test.pro
index d61606cefb..f0e0f7593c 100644
--- 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