Put QPacketProtocol into its own static library

We need it in 3 places in qtdeclarative and we could also use it in
QtCreator. We don't want to bundle it with the debug client code as it
is also necessary for the server.

QPacket replaces QQmlDebugStream as it has the same purpose. This
also fixes the inconsitent handling of data stream versions.

Change-Id: I650fae353f267511c551b427d9169f4d718aa7f2
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 13 insertions, 20 deletions

diff --git a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
index d3a8d1f0d1..bfbeef5856 100644
--- a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
+++ b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
@@ -33,7 +33,6 @@
 
 #include "qqmldebugserver.h"
 #include "qqmldebugserverfactory.h"
-#include "qpacketprotocol.h"
 #include "qqmldebugserverconnection.h"
 
 #include <private/qqmldebugservice_p.h>
@@ -41,6 +40,8 @@
 #include <private/qqmlglobal_p.h>
 #include <private/qqmldebugpluginmanager_p.h>
 #include <private/qqmldebugserviceinterfaces_p.h>
+#include <private/qpacketprotocol_p.h>
+#include <private/qpacket_p.h>
 
 #include <QtCore/QAtomicInt>
 #include <QtCore/QDir>
@@ -48,9 +49,6 @@
 #include <QtCore/QStringList>
 #include <QtCore/qwaitcondition.h>
 
-#include <private/qobject_p.h>
-#include <private/qcoreapplication_p.h>
-
 QT_BEGIN_NAMESPACE
 
 /*
@@ -431,7 +429,7 @@ void QQmlDebugServerImpl::receiveMessage()
     if (!m_protocol)
         return;
 
-    QQmlDebugStream in(m_protocol->read().data());
+    QPacket in(m_protocol->read().data());
 
     QString name;
 
@@ -445,16 +443,17 @@ void QQmlDebugServerImpl::receiveMessage()
 
             //Get the supported QDataStream version
             if (!in.atEnd()) {
-                in >> QQmlDebugStream::s_dataStreamVersion;
-                if (QQmlDebugStream::s_dataStreamVersion > QDataStream().version())
-                    QQmlDebugStream::s_dataStreamVersion = QDataStream().version();
+                int dataStreamVersion;
+                in >> dataStreamVersion;
+                if (dataStreamVersion > QDataStream().version())
+                    dataStreamVersion = QDataStream().version();
+                QPacket::setDataStreamVersion(dataStreamVersion);
             }
 
             // Send the hello answer immediately, since it needs to arrive before
             // the plugins below start sending messages.
 
-            QByteArray helloAnswer;
-            QQmlDebugStream out(&helloAnswer, QIODevice::WriteOnly);
+            QPacket out;
             QStringList pluginNames;
             QList<float> pluginVersions;
             const int count = m_plugins.count();
@@ -467,11 +466,9 @@ void QQmlDebugServerImpl::receiveMessage()
             }
 
             out << QString(QStringLiteral("QDeclarativeDebugClient")) << 0 << protocolVersion
-                << pluginNames << pluginVersions << QQmlDebugStream::s_dataStreamVersion;
+                << pluginNames << pluginVersions << QPacket::dataStreamVersion();
 
-            QPacket pack;
-            pack.writeRawData(helloAnswer.data(), helloAnswer.length());
-            m_protocol->send(pack);
+            m_protocol->send(out);
             m_connection->flush();
 
             QMutexLocker helloLock(&m_helloMutex);
@@ -653,13 +650,9 @@ bool QQmlDebugServerImpl::canSendMessage(const QString &name)
 
 void QQmlDebugServerImpl::doSendMessage(const QString &name, const QByteArray &message)
 {
-    QByteArray prefixed;
-    QQmlDebugStream out(&prefixed, QIODevice::WriteOnly);
+    QPacket out;
     out << name << message;
-
-    QPacket pack;
-    pack.writeRawData(prefixed.data(), prefixed.length());
-    m_protocol->send(pack);
+    m_protocol->send(out);
 }
 
 void QQmlDebugServerImpl::sendMessage(const QString &name, const QByteArray &message)