Cleanup autotest pro file

3 files changed, 109 insertions, 98 deletions

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 6067c70ad9..d72f745d25 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -1,107 +1,118 @@
 TEMPLATE = subdirs
+
+METATYPETESTS += \
+    qdeclarativemetatype \
+    qmetaobjectbuilder
+
+PUBLICTESTS += \
+    examples \
+    geometry \
+    nodes \
+    parserstress \
+    qdeclarativecomponent \
+    qdeclarativecontext \
+    qdeclarativeengine \
+    qdeclarativeerror \
+    qdeclarativefolderlistmodel \
+    qdeclarativeinfo \
+    qdeclarativelayoutitem \
+    qdeclarativelistreference \
+    qdeclarativemoduleplugin \
+    qdeclarativeparticles \
+    qdeclarativepixmapcache \
+    qdeclarativeqt \
+    qdeclarativeview \
+    qdeclarativeviewer \
+    qdeclarativexmlhttprequest \
+    moduleqt47
+
+PRIVATETESTS += \
+    qdeclarativeanchors \
+    qdeclarativeanimatedimage \
+    qdeclarativeanimations \
+    qdeclarativeapplication \
+    qdeclarativebehaviors \
+    qdeclarativebinding \
+    qdeclarativeborderimage \
+    qdeclarativeconnection \
+    qdeclarativedebug \
+    qdeclarativedebugclient \
+    qdeclarativedebughelper \
+    qdeclarativedebugservice \
+    qdeclarativeecmascript \
+    qdeclarativeflickable \
+    qdeclarativeflipable \
+    qdeclarativefocusscope \
+    qdeclarativefontloader \
+    qdeclarativegridview \
+    qdeclarativeimage \
+    qdeclarativeimageprovider \
+    qdeclarativeinstruction \
+    qdeclarativeitem \
+    qdeclarativelanguage \
+    qdeclarativelistmodel \
+    qdeclarativelistview \
+    qdeclarativeloader \
+    qdeclarativemousearea \
+    qdeclarativepathview \
+    qdeclarativepincharea \
+    qdeclarativepositioners \
+    qdeclarativeproperty \
+    qdeclarativepropertymap \
+    qdeclarativerepeater \
+    # qdeclarativescriptdebugging \
+    qdeclarativesmoothedanimation \
+    qdeclarativespringanimation \
+    qdeclarativestyledtext \
+    qdeclarativesqldatabase \
+    qdeclarativestates \
+    qdeclarativesystempalette \
+    qdeclarativetext \
+    qdeclarativetextedit \
+    qdeclarativetextinput \
+    qdeclarativetimer \
+    qdeclarativevaluetypes \
+    qdeclarativevisualdatamodel \
+    qdeclarativeworkerscript \
+    qdeclarativexmllistmodel \
+    qpacketprotocol \
+    qdeclarativev4 \
+    v8
+
+SGTESTS =  \
+    qsganimatedimage \
+    qsgborderimage \
+    qsgcanvas \
+    qsgflickable \
+    qsgflipable \
+    qsgfocusscope \
+    qsggridview \
+    qsgimage \
+    qsgitem \
+    qsglistview \
+    qsgloader \
+    qsgmousearea \
+    qsgpathview \
+    qsgpincharea \
+    qsgpositioners \
+    qsgrepeater \
+    qsgtext \
+    qsgtextedit \
+    qsgtextinput \
+    qsgvisualdatamodel \
+
+
+SUBDIRS += $$PUBLICTESTS
+
 !symbian: {
-SUBDIRS += \
-           qdeclarativemetatype \
-           qmetaobjectbuilder
+    SUBDIRS += $$METATYPETESTS
 }
 
-SUBDIRS += \
-           examples \
-           geometry \
-           node \
-           parserstress \
-           qdeclarativecomponent \
-           qdeclarativecontext \
-           qdeclarativeengine \
-           qdeclarativeerror \
-           qdeclarativefolderlistmodel \
-           qdeclarativeinfo \
-           qdeclarativelayoutitem \
-           qdeclarativelistreference \
-           qdeclarativemoduleplugin \
-           qdeclarativeparticles \
-           qdeclarativepixmapcache \
-           qdeclarativeqt \
-           qdeclarativeview \
-           qdeclarativeviewer \
-           qdeclarativexmlhttprequest \
-           moduleqt47
-
 contains(QT_CONFIG, private_tests) {
-    SUBDIRS += \
-           qdeclarativeanchors \
-           qdeclarativeanimatedimage \
-           qdeclarativeanimations \
-           qdeclarativeapplication \
-           qdeclarativebehaviors \
-           qdeclarativebinding \
-           qdeclarativeborderimage \
-           qdeclarativeconnection \
-           qdeclarativedebug \
-           qdeclarativedebugclient \
-           qdeclarativedebughelper \
-           qdeclarativedebugservice \
-           qdeclarativeecmascript \
-           qdeclarativeflickable \
-           qdeclarativeflipable \
-           qdeclarativefocusscope \
-           qdeclarativefontloader \
-           qdeclarativegridview \
-           qdeclarativeimage \
-           qdeclarativeimageprovider \
-           qdeclarativeinstruction \
-           qdeclarativeitem \
-           qdeclarativelanguage \
-           qdeclarativelistmodel \
-           qdeclarativelistview \
-           qdeclarativeloader \
-           qdeclarativemousearea \
-           qdeclarativepathview \
-           qdeclarativepincharea \
-           qdeclarativepositioners \
-           qdeclarativeproperty \
-           qdeclarativepropertymap \
-           qdeclarativerepeater \
-#           qdeclarativescriptdebugging \
-           qdeclarativesmoothedanimation \
-           qdeclarativespringanimation \
-           qdeclarativestyledtext \
-           qdeclarativesqldatabase \
-           qdeclarativestates \
-           qdeclarativesystempalette \
-           qdeclarativetext \
-           qdeclarativetextedit \
-           qdeclarativetextinput \
-           qdeclarativetimer \
-           qdeclarativevaluetypes \
-           qdeclarativevisualdatamodel \
-           qdeclarativeworkerscript \
-           qdeclarativexmllistmodel \
-           qpacketprotocol \
-           qdeclarativev4 \
-           qsganimatedimage \
-           qsgborderimage \
-           qsgcanvas \
-           qsgflickable \
-           qsgflipable \
-           qsgfocusscope \
-           qsggridview \
-           qsgimage \
-           qsgitem \
-           qsglistview \
-           qsgloader \
-           qsgmousearea \
-           qsgpathview \
-           qsgpincharea \
-           qsgpositioners \
-           qsgrepeater \
-           qsgtext \
-           qsgtextedit \
-           qsgtextinput \
-           qsgvisualdatamodel \
-           v8
-
+    SUBDIRS += $$PRIVATETESTS
+    SUBDIRS += $$SGTESTS
 }
 
 # Tests which should run in Pulse
 PULSE_TESTS = $$SUBDIRS
+
diff --git a/tests/auto/declarative/node/nodes.pro b/tests/auto/declarative/nodes/nodes.pro
index 19d3b09a43..19d3b09a43 100644
--- a/tests/auto/declarative/node/nodes.pro
+++ b/tests/auto/declarative/nodes/nodes.pro
diff --git a/tests/auto/declarative/node/tst_nodestest.cpp b/tests/auto/declarative/nodes/tst_nodestest.cpp
index a1b0a6ac91..a1b0a6ac91 100644
--- a/tests/auto/declarative/node/tst_nodestest.cpp
+++ b/tests/auto/declarative/nodes/tst_nodestest.cpp