QmlDebuggingTests: Separate out public and private tests

Remove dependencies on quick-private from all possible debugging auto tests and list them under public tests. Change-Id: I688b5b36fdf3d6fbcb6cef2a975ecd1bf679af2b Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
sailfishos · Mar 19, 2012 · 5c05f5d · 5c05f5d
1 parent c975f80
commit 5c05f5d
Show file tree

Hide file tree

Showing 32 changed files with 1,000 additions and 187 deletions.
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
@@ -9,10 +9,14 @@ DESTDIR = $$QT.qml.plugins/qmltooling
 QTDIR_build:REQUIRES += "contains(QT_CONFIG, qml)"
 
 SOURCES += \
-    qtcpserverconnection.cpp
+    qtcpserverconnection.cpp \
+    ../shared/qpacketprotocol.cpp
 
 HEADERS += \
-    qtcpserverconnection.h
+    qtcpserverconnection.h \
+    ../shared/qpacketprotocol.h
+
+INCLUDEPATH += ../shared
 
 OTHER_FILES += qtcpserverconnection.json
 

diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
@@ -40,13 +40,13 @@
 ****************************************************************************/
 
 #include "qtcpserverconnection.h"
+#include "qpacketprotocol.h"
 
 #include <QtCore/qplugin.h>
 #include <QtNetwork/qtcpserver.h>
 #include <QtNetwork/qtcpsocket.h>
 
 #include <private/qqmldebugserver_p.h>
-#include <private/qpacketprotocol_p.h>
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/qml/debugger/qpacketprotocol.cpp → ...ins/qmltooling/shared/qpacketprotocol.cpp b/src/qml/debugger/qpacketprotocol.cpp → ...ins/qmltooling/shared/qpacketprotocol.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qpacketprotocol_p.h"
+#include "qpacketprotocol.h"
 
 #include <QtCore/QBuffer>
 #include <QtCore/QElapsedTimer>

diff --git a/src/qml/debugger/qpacketprotocol_p.h → ...ugins/qmltooling/shared/qpacketprotocol.h b/src/qml/debugger/qpacketprotocol_p.h → ...ugins/qmltooling/shared/qpacketprotocol.h
@@ -42,34 +42,18 @@
 #ifndef QPACKETPROTOCOL_H
 #define QPACKETPROTOCOL_H
 
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
 #include <QtCore/qobject.h>
 #include <QtCore/qdatastream.h>
 
-#include <private/qtqmlglobal_p.h>
-
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
 class QIODevice;
 class QBuffer;
 class QPacket;
 class QPacketAutoSend;
 class QPacketProtocolPrivate;
 
-class Q_QML_PRIVATE_EXPORT QPacketProtocol : public QObject
+class QPacketProtocol : public QObject
 {
     Q_OBJECT
 public:
@@ -101,7 +85,7 @@ class Q_QML_PRIVATE_EXPORT QPacketProtocol : public QObject
 };
 
 
-class Q_QML_PRIVATE_EXPORT QPacket : public QDataStream
+class QPacket : public QDataStream
 {
 public:
     QPacket();
@@ -119,7 +103,7 @@ class Q_QML_PRIVATE_EXPORT QPacket : public QDataStream
     QBuffer *buf;
 };
 
-class Q_QML_PRIVATE_EXPORT QPacketAutoSend : public QPacket
+class QPacketAutoSend : public QPacket
 {
 public:
     virtual ~QPacketAutoSend();
@@ -132,6 +116,4 @@ class Q_QML_PRIVATE_EXPORT QPacketAutoSend : public QPacket
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri
@@ -1,5 +1,4 @@
 SOURCES += \
-    $$PWD/qpacketprotocol.cpp \
     $$PWD/qqmldebugservice.cpp \
     $$PWD/qqmlprofilerservice.cpp \
     $$PWD/qqmldebugserver.cpp \
@@ -10,7 +9,6 @@ SOURCES += \
     $$PWD/qdebugmessageservice.cpp
 
 HEADERS += \
-    $$PWD/qpacketprotocol_p.h \
     $$PWD/qqmldebugservice_p.h \
     $$PWD/qqmldebugservice_p_p.h \
     $$PWD/qqmlprofilerservice_p.h \

diff --git a/tests/auto/qml/debugger/debugger.pro b/tests/auto/qml/debugger/debugger.pro
@@ -1,16 +1,20 @@
 TEMPLATE = subdirs
 
-PRIVATETESTS += \
+PUBLICTESTS += \
     qqmlenginedebugservice \
-    qqmldebugclient \
-    qqmldebugservice \
     qqmldebugjs \
     qqmlinspector \
     qqmlprofilerservice \
     qpacketprotocol \
     qv8profilerservice \
     qdebugmessageservice
 
+PRIVATETESTS += \
+    qqmldebugclient \
+    qqmldebugservice
+
+SUBDIRS += $$PUBLICTESTS
+
 contains(QT_CONFIG, private_tests) {
     SUBDIRS += $$PRIVATETESTS
 }
diff --git a/tests/auto/qml/debugger/qdebugmessageservice/qdebugmessageservice.pro b/tests/auto/qml/debugger/qdebugmessageservice/qdebugmessageservice.pro
@@ -1,6 +1,6 @@
 CONFIG += testcase
 TARGET = tst_qdebugmessageservice
-QT += network qml-private testlib
+QT += qml network testlib
 macx:CONFIG -= app_bundle
 
 SOURCES +=     tst_qdebugmessageservice.cpp

diff --git a/tests/auto/qml/debugger/qpacketprotocol/qpacketprotocol.pro b/tests/auto/qml/debugger/qpacketprotocol/qpacketprotocol.pro
@@ -8,4 +8,4 @@ INCLUDEPATH += ../shared
 include(../shared/debugutil.pri)
 
 CONFIG += parallel_test
-QT += qml-private network testlib
+QT += qml network testlib
diff --git a/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp
@@ -46,7 +46,7 @@
 #include <QDebug>
 #include <QBuffer>
 
-#include <private/qpacketprotocol_p.h>
+#include "../../../../../src/plugins/qmltooling/shared/qpacketprotocol.h"
 
 #include "debugutil_p.h"
 

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

diff --git a/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp b/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp
@@ -48,6 +48,7 @@
 #include <QtQml/qqmlengine.h>
 
 #include "debugutil_p.h"
+#include "qqmldebugtestservice.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
@@ -1,6 +1,6 @@
 CONFIG += testcase
 TARGET = tst_qqmldebugjs
-QT += qml-private testlib
+QT += qml testlib
 macx:CONFIG -= app_bundle
 
 SOURCES +=     tst_qqmldebugjs.cpp

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

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

diff --git a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.pro b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.pro
@@ -9,4 +9,4 @@ include(../shared/debugutil.pri)
 
 CONFIG += parallel_test declarative_debug
 
-QT += qml-private testlib
+QT += qml testlib
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro b/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro
@@ -12,4 +12,4 @@ OTHER_FILES += data/test.qml
 
 CONFIG += parallel_test declarative_debug
 
-QT += core-private v8-private qml-private testlib
+QT += core qml testlib