16 files changed, 18 insertions, 11 deletions
diff --git a/tests/auto/declarative/debugger/debugger.pro b/tests/auto/declarative/debugger/debugger.pro
new file mode 100644
index 0000000000..3ea5c41775
--- /dev/null
+++ b/tests/auto/declarative/debugger/debugger.pro
@@ -0,0 +1,12 @@
+TEMPLATE = subdirs
+
+PRIVATETESTS += \
+    qdeclarativeenginedebug \
+    qdeclarativedebugclient \
+    qdeclarativedebugservice \
+#    qdeclarativedebugjs \
+    qpacketprotocol
+
+contains(QT_CONFIG, private_tests) {
+    SUBDIRS += $$PRIVATETESTS
+}
diff --git a/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro b/tests/auto/declarative/debugger/qdeclarativedebugclient/qdeclarativedebugclient.pro
index 850a0d4ecc..850a0d4ecc 100644
--- a/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro
+++ b/tests/auto/declarative/debugger/qdeclarativedebugclient/qdeclarativedebugclient.pro
diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/debugger/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
index 220669ad8d..55a49c7bc2 100644
--- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
+++ b/tests/auto/declarative/debugger/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
@@ -47,7 +47,7 @@
 
 #include <QtDeclarative/qdeclarativeengine.h>
 
-#include "../../../shared/util.h"
+#include "../../../../shared/util.h"
 #include "../shared/debugutil_p.h"
 
 #define PORT 13770
diff --git a/tests/auto/declarative/qdeclarativedebugjs/data/test.js b/tests/auto/declarative/debugger/qdeclarativedebugjs/data/test.js
index 230a4ea7de..230a4ea7de 100644
--- a/tests/auto/declarative/qdeclarativedebugjs/data/test.js
+++ b/tests/auto/declarative/debugger/qdeclarativedebugjs/data/test.js
diff --git a/tests/auto/declarative/qdeclarativedebugjs/data/test.qml b/tests/auto/declarative/debugger/qdeclarativedebugjs/data/test.qml
index 386b366cab..386b366cab 100644
--- a/tests/auto/declarative/qdeclarativedebugjs/data/test.qml
+++ b/tests/auto/declarative/debugger/qdeclarativedebugjs/data/test.qml
diff --git a/tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro b/tests/auto/declarative/debugger/qdeclarativedebugjs/qdeclarativedebugjs.pro
index a6f005e84f..a6f005e84f 100644
--- a/tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro
+++ b/tests/auto/declarative/debugger/qdeclarativedebugjs/qdeclarativedebugjs.pro
diff --git a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp b/tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp
index fbc1ff6824..ee4005656e 100644
--- a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp
+++ b/tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp
@@ -50,9 +50,8 @@
 #include <QtDeclarative/QJSEngine>
 
 //QDeclarativeDebugTest
-#include "../../../shared/util.h"
 #include "../shared/debugutil_p.h"
-#include "../shared/util.h"
+#include "../../shared/util.h"
 
 const char *SEQ = "seq";
 const char *TYPE = "type";
diff --git a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro b/tests/auto/declarative/debugger/qdeclarativedebugservice/qdeclarativedebugservice.pro
index c23e9204f7..c23e9204f7 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro
+++ b/tests/auto/declarative/debugger/qdeclarativedebugservice/qdeclarativedebugservice.pro
diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
index 011bd40cbc..91e06cec8a 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
+++ b/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
@@ -50,7 +50,8 @@
 #include <private/qdeclarativedebugclient_p.h>
 #include <private/qdeclarativedebugservice_p.h>
 
-#include "../../../shared/util.h"
+#include "../../../../shared/util.h"
+#include "../../shared/util.h"
 #include "../shared/debugutil_p.h"
 
 
diff --git a/tests/auto/declarative/qdeclarativeenginedebug/qdeclarativeenginedebug.pro b/tests/auto/declarative/debugger/qdeclarativeenginedebug/qdeclarativeenginedebug.pro
index 98736c6628..98736c6628 100644
--- a/tests/auto/declarative/qdeclarativeenginedebug/qdeclarativeenginedebug.pro
+++ b/tests/auto/declarative/debugger/qdeclarativeenginedebug/qdeclarativeenginedebug.pro
diff --git a/tests/auto/declarative/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp b/tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp
index 0e4eebb349..7ef2ee1649 100644
--- a/tests/auto/declarative/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp
+++ b/tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp
@@ -58,7 +58,7 @@
 #include <private/qdeclarativemetatype_p.h>
 #include <private/qdeclarativeproperty_p.h>
 
-#include "../../../shared/util.h"
+#include "../../../../shared/util.h"
 #include "../shared/debugutil_p.h"
 
 Q_DECLARE_METATYPE(QDeclarativeDebugWatch::State)
diff --git a/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro b/tests/auto/declarative/debugger/qpacketprotocol/qpacketprotocol.pro
index 076ab98505..076ab98505 100644
--- a/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro
+++ b/tests/auto/declarative/debugger/qpacketprotocol/qpacketprotocol.pro
diff --git a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/declarative/debugger/qpacketprotocol/tst_qpacketprotocol.cpp
index 87fa12fdb7..87fa12fdb7 100644
--- a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
+++ b/tests/auto/declarative/debugger/qpacketprotocol/tst_qpacketprotocol.cpp
diff --git a/tests/auto/declarative/shared/debugutil.cpp b/tests/auto/declarative/debugger/shared/debugutil.cpp
index 99f8dcce0b..99f8dcce0b 100644
--- a/tests/auto/declarative/shared/debugutil.cpp
+++ b/tests/auto/declarative/debugger/shared/debugutil.cpp
diff --git a/tests/auto/declarative/shared/debugutil_p.h b/tests/auto/declarative/debugger/shared/debugutil_p.h
index be8df86b90..be8df86b90 100644
--- a/tests/auto/declarative/shared/debugutil_p.h
+++ b/tests/auto/declarative/debugger/shared/debugutil_p.h
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 719318252d..831061d86f 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -35,10 +35,6 @@ PRIVATETESTS += \
     qdeclarativebinding \
     qdeclarativechangeset \
     qdeclarativeconnection \
-    qdeclarativeenginedebug \
-    qdeclarativedebugclient \
-    qdeclarativedebugservice \
-#   qdeclarativedebugjs \
     qdeclarativeecmascript \
     qdeclarativeexpression \
     qdeclarativefontloader \
@@ -61,7 +57,6 @@ PRIVATETESTS += \
     qdeclarativevaluetypes \
     qdeclarativeworkerscript \
     qdeclarativexmllistmodel \
-    qpacketprotocol \
     v4
 
 # This test requires the xmlpatterns module
@@ -96,8 +91,8 @@ SGTESTS =  \
 
 
 SUBDIRS += $$PUBLICTESTS
-
 SUBDIRS += $$METATYPETESTS
+SUBDIRS += debugger
 
 contains(QT_CONFIG, private_tests) {
     SUBDIRS += $$PRIVATETESTS