QmlDebugging: Remove QQmlDebugClient

Remove QQmlDebugClient and relevant classes from the library and move to client code. Change-Id: I6f526b3f0c92970dcad5e5abd8585bb9b406349e Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
sailfishos · Mar 9, 2012 · 5c7b173 · 5c7b173
1 parent eefbdbf
commit 5c7b173
Show file tree

Hide file tree

Showing 30 changed files with 629 additions and 148 deletions.
diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri
@@ -1,8 +1,6 @@
 SOURCES += \
     $$PWD/qpacketprotocol.cpp \
     $$PWD/qqmldebugservice.cpp \
-    $$PWD/qqmldebugclient.cpp \
-    $$PWD/qqmlenginedebug.cpp \
     $$PWD/qqmlprofilerservice.cpp \
     $$PWD/qqmldebugserver.cpp \
     $$PWD/qqmlinspectorservice.cpp \
@@ -15,8 +13,6 @@ HEADERS += \
     $$PWD/qpacketprotocol_p.h \
     $$PWD/qqmldebugservice_p.h \
     $$PWD/qqmldebugservice_p_p.h \
-    $$PWD/qqmldebugclient_p.h \
-    $$PWD/qqmlenginedebug_p.h \
     $$PWD/qqmlprofilerservice_p.h \
     $$PWD/qqmldebugserver_p.h \
     $$PWD/qqmldebugserverconnection_p.h \

diff --git a/tests/auto/qml/debugger/debugger.pro b/tests/auto/qml/debugger/debugger.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs
 
 PRIVATETESTS += \
-    qqmlenginedebug \
+    qqmlenginedebugservice \
     qqmldebugclient \
     qqmldebugservice \
     qqmldebugjs \

diff --git a/tests/auto/qml/debugger/qdebugmessageservice/qdebugmessageservice.pro b/tests/auto/qml/debugger/qdebugmessageservice/qdebugmessageservice.pro
@@ -3,14 +3,11 @@ TARGET = tst_qdebugmessageservice
 QT += network qml-private testlib
 macx:CONFIG -= app_bundle
 
-HEADERS += ../shared/debugutil_p.h
-
-SOURCES +=     tst_qdebugmessageservice.cpp \
-            ../shared/debugutil.cpp
+SOURCES +=     tst_qdebugmessageservice.cpp
 
 INCLUDEPATH += ../shared
-
 include(../../../shared/util.pri)
+include(../shared/debugutil.pri)
 
 TESTDATA = data/*
 

diff --git a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include <QtQml/private/qqmldebugclient_p.h>
+#include "qqmldebugclient.h"
 
 //QQmlDebugTest
-#include "../shared/debugutil_p.h"
+#include "debugutil_p.h"
 #include "../../../shared/util.h"
 
 #include <QtCore/QString>

diff --git a/tests/auto/qml/debugger/qpacketprotocol/qpacketprotocol.pro b/tests/auto/qml/debugger/qpacketprotocol/qpacketprotocol.pro
@@ -2,9 +2,10 @@ CONFIG += testcase
 TARGET = tst_qpacketprotocol
 macx:CONFIG -= app_bundle
 
-HEADERS += ../shared/debugutil_p.h
-SOURCES += tst_qpacketprotocol.cpp \
-           ../shared/debugutil.cpp
+SOURCES += tst_qpacketprotocol.cpp
+
+INCLUDEPATH += ../shared
+include(../shared/debugutil.pri)
 
 CONFIG += parallel_test
 QT += qml-private network testlib
diff --git a/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp
@@ -48,7 +48,7 @@
 
 #include <private/qpacketprotocol_p.h>
 
-#include "../shared/debugutil_p.h"
+#include "debugutil_p.h"
 
 class tst_QPacketProtocol : public QObject
 {

diff --git a/tests/auto/qml/debugger/qqmldebugclient/qqmldebugclient.pro b/tests/auto/qml/debugger/qqmldebugclient/qqmldebugclient.pro
@@ -2,9 +2,10 @@ CONFIG += testcase
 TARGET = tst_qqmldebugclient
 macx:CONFIG -= app_bundle
 
-HEADERS += ../shared/debugutil_p.h
-SOURCES += tst_qqmldebugclient.cpp \
-           ../shared/debugutil.cpp
+SOURCES += tst_qqmldebugclient.cpp
+
+INCLUDEPATH += ../shared
+include(../shared/debugutil.pri)
 
 CONFIG += declarative_debug
 

diff --git a/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp b/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp
@@ -47,7 +47,7 @@
 
 #include <QtQml/qqmlengine.h>
 
-#include "../shared/debugutil_p.h"
+#include "debugutil_p.h"
 
 #define PORT 13770
 #define STR_PORT "13770"

diff --git a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro
@@ -3,13 +3,11 @@ TARGET = tst_qqmldebugjs
 QT += qml-private testlib
 macx:CONFIG -= app_bundle
 
-HEADERS += ../shared/debugutil_p.h
-SOURCES +=     tst_qqmldebugjs.cpp \
-            ../shared/debugutil.cpp
+SOURCES +=     tst_qqmldebugjs.cpp
 
 INCLUDEPATH += ../shared
-
-include (../../../shared/util.pri)
+include(../../../shared/util.pri)
+include(../shared/debugutil.pri)
 
 TESTDATA = data/*
 

diff --git a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
@@ -46,11 +46,11 @@
 #include <QtCore/QDir>
 #include <QtCore/QMutex>
 #include <QtCore/QLibraryInfo>
-#include <QtQml/private/qqmldebugclient_p.h>
 #include <QtQml/QJSEngine>
 
 //QQmlDebugTest
-#include "../shared/debugutil_p.h"
+#include "debugutil_p.h"
+#include "qqmldebugclient.h"
 #include "../../../shared/util.h"
 
 const char *V8REQUEST = "v8request";

diff --git a/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro b/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro
@@ -2,9 +2,10 @@ CONFIG += testcase
 TARGET = tst_qqmldebugservice
 macx:CONFIG -= app_bundle
 
-HEADERS += ../shared/debugutil_p.h
-SOURCES += tst_qqmldebugservice.cpp \
-           ../shared/debugutil.cpp
+SOURCES += tst_qqmldebugservice.cpp
+INCLUDEPATH += ../shared
+include(../../../shared/util.pri)
+include(../shared/debugutil.pri)
 
 CONFIG += parallel_test declarative_debug
 

diff --git a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
@@ -47,11 +47,11 @@
 
 #include <QtQml/qqmlengine.h>
 
-#include <private/qqmldebugclient_p.h>
 #include <private/qqmldebugservice_p.h>
 
 #include "../../../shared/util.h"
-#include "../shared/debugutil_p.h"
+#include "debugutil_p.h"
+#include "qqmldebugclient.h"
 
 #define PORT 13769
 #define STR_PORT "13769"

diff --git a/...ugger/qqmlenginedebug/qqmlenginedebug.pro → ...nedebugservice/qqmlenginedebugservice.pro b/...ugger/qqmlenginedebug/qqmlenginedebug.pro → ...nedebugservice/qqmlenginedebugservice.pro
@@ -1,10 +1,11 @@
 CONFIG += testcase
-TARGET = tst_qqmlenginedebug
+TARGET = tst_qqmlenginedebugservice
 macx:CONFIG -= app_bundle
 
-HEADERS += ../shared/debugutil_p.h
-SOURCES += tst_qqmlenginedebug.cpp \
-           ../shared/debugutil.cpp
+SOURCES += tst_qqmlenginedebugservice.cpp
+
+INCLUDEPATH += ../shared
+include(../shared/debugutil.pri)
 
 CONFIG += parallel_test declarative_debug