Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  tests: make tests compile or disable those which don't compile

9 files changed, 44 insertions, 6 deletions

diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
index 6810f76..cb1f2ef 100644
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro
@@ -105,6 +105,10 @@ SUBDIRS=\
    qfilesystementry \
    qabstractfileengine
 
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+   qfileinfo \
+   qfilesystementry \
+
 symbian:SUBDIRS -= \
    qtconcurrentfilter \
    qtconcurrentiteratekernel \
diff --git a/tests/auto/dbus.pro b/tests/auto/dbus.pro
index 31b46a3..7470bf8 100644
--- a/tests/auto/dbus.pro
+++ b/tests/auto/dbus.pro
@@ -17,3 +17,5 @@ SUBDIRS=\
            qdbusthreading \
            qdbusxmlparser \
 
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+           qdbusmarshall \
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index 17f56f2..cde39c2 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -209,11 +209,26 @@ SUBDIRS=\
 win32:SUBDIRS -= qtextpiecetable
 
 !contains(QT_CONFIG, private_tests): SUBDIRS -= \
-           qgraphicssceneindex \
-           qnetworkreply \
-           qpathclipper \
-           qstylesheetstyle \
-           qtextpiecetable \
+    qcolumnview \
+    qgraphicsanchorlayout \
+    qgraphicsanchorlayout1 \
+    qgraphicsitem \
+    qgraphicsscene \
+    qgraphicssceneindex \
+    qlistwidget \
+    qmainwindow \
+    qnetworkreply \
+    qpathclipper \
+    qpixmapcache \
+    qsidebar \
+    qstatictext \
+    qstylesheetstyle \
+    qtcpsocket \
+    qtextlayout \
+    qtextpiecetable \
+    qtipc \
+    qtoolbar \
+    qtreeview \
 
 symbian:SUBDIRS -= \
     qsystemtrayicon \
diff --git a/tests/auto/network.pro b/tests/auto/network.pro
index e4cecce..9eb358f 100644
--- a/tests/auto/network.pro
+++ b/tests/auto/network.pro
@@ -46,9 +46,15 @@ SUBDIRS=\
 
 !contains(QT_CONFIG, private_tests): SUBDIRS -= \
     qauthenticator \
+    qhostinfo \
     qhttpnetworkconnection \
     qhttpnetworkreply \
+    qhttpsocketengine \
+    qnetworkreply \
     platformsocketengine \
     qsocketnotifier \
     qsocks5socketengine \
+    qsslsocket \
+    qsslsocket_onDemandCertificates_member \
+    qsslsocket_onDemandCertificates_static \
 
diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index 655d666..b50e169 100644
--- a/tests/auto/other.pro
+++ b/tests/auto/other.pro
@@ -60,5 +60,7 @@ symbian {
 
 # Following tests depends on private API
 !contains(QT_CONFIG, private_tests): SUBDIRS -= \
+           qcombobox \
            qcssparser \
+           qtextedit \
 
diff --git a/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro b/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro
index 9fef8e4..3193caa 100644
--- a/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro
+++ b/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro
@@ -1,4 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS = test qsystemlock
 
-
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+          test \
+          qsystemlock \
diff --git a/tests/auto/qtipc/qtipc.pro b/tests/auto/qtipc/qtipc.pro
index 60037d2..fb32e51 100644
--- a/tests/auto/qtipc/qtipc.pro
+++ b/tests/auto/qtipc/qtipc.pro
@@ -4,3 +4,7 @@ SUBDIRS=\
     qsharedmemory \
     qsystemsemaphore \
 
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+    lackey \
+    qsharedmemory \
+    qsystemsemaphore \
diff --git a/tests/auto/script.pro b/tests/auto/script.pro
index c4d0544..80d259d 100644
--- a/tests/auto/script.pro
+++ b/tests/auto/script.pro
@@ -16,3 +16,5 @@ SUBDIRS=\
            qscriptvaluegenerated \
            qscriptvalueiterator \
 
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+           qscriptcontext \
diff --git a/tests/auto/xmlpatterns.pro b/tests/auto/xmlpatterns.pro
index b9244d6..4940cc4 100644
--- a/tests/auto/xmlpatterns.pro
+++ b/tests/auto/xmlpatterns.pro
@@ -46,4 +46,5 @@ xmlpatternsxqts.depends = xmlpatternssdk
            xmlpatternssdk \
            xmlpatternsxqts \
            xmlpatternsxslts \
+           xmlpatternsschemats \