Move data stream version into QQmlDebugStream

When moving the server into a plugin we won't be able to directly
access it anymore.

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

4 files changed, 12 insertions, 12 deletions

diff --git a/src/qml/debugger/qqmldebugserver.cpp b/src/qml/debugger/qqmldebugserver.cpp
index 020d0ad52d..a4d8f0ede0 100644
--- a/src/qml/debugger/qqmldebugserver.cpp
+++ b/src/qml/debugger/qqmldebugserver.cpp
@@ -91,7 +91,6 @@ Q_GLOBAL_STATIC(QQmlDebugServerInstanceWrapper, debugServerInstance)
   */
 
 const int protocolVersion = 1;
-int QQmlDebugServer::s_dataStreamVersion = QDataStream::Qt_4_7;
 
 // print detailed information about loading of plugins
 #ifndef QT_NO_LIBRARY
@@ -530,9 +529,9 @@ void QQmlDebugServer::receiveMessage(const QByteArray &message)
 
             //Get the supported QDataStream version
             if (!in.atEnd()) {
-                in >> s_dataStreamVersion;
-                if (s_dataStreamVersion > QDataStream().version())
-                    s_dataStreamVersion = QDataStream().version();
+                in >> QQmlDebugStream::s_dataStreamVersion;
+                if (QQmlDebugStream::s_dataStreamVersion > QDataStream().version())
+                    QQmlDebugStream::s_dataStreamVersion = QDataStream().version();
             }
 
             // Send the hello answer immediately, since it needs to arrive before
@@ -552,7 +551,7 @@ void QQmlDebugServer::receiveMessage(const QByteArray &message)
             }
 
             out << QString(QStringLiteral("QDeclarativeDebugClient")) << 0 << protocolVersion
-                << pluginNames << pluginVersions << s_dataStreamVersion;
+                << pluginNames << pluginVersions << QQmlDebugStream::s_dataStreamVersion;
 
             d->connection->send(QList<QByteArray>() << helloAnswer);
 
diff --git a/src/qml/debugger/qqmldebugserver_p.h b/src/qml/debugger/qqmldebugserver_p.h
index f4026ca85f..8a740635da 100644
--- a/src/qml/debugger/qqmldebugserver_p.h
+++ b/src/qml/debugger/qqmldebugserver_p.h
@@ -93,9 +93,6 @@ private:
                                                         QQmlDebugService::State state))
     Q_PRIVATE_SLOT(d_func(), void _q_sendMessages(QList<QByteArray>))
     Q_PRIVATE_SLOT(d_func(), void _q_removeThread())
-
-public:
-    static int s_dataStreamVersion;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qml/debugger/qqmldebugservice.cpp b/src/qml/debugger/qqmldebugservice.cpp
index 769560bfa0..da9300477b 100644
--- a/src/qml/debugger/qqmldebugservice.cpp
+++ b/src/qml/debugger/qqmldebugservice.cpp
@@ -235,28 +235,30 @@ void QQmlDebugService::engineRemoved(QQmlEngine *)
 {
 }
 
+int QQmlDebugStream::s_dataStreamVersion = QDataStream::Qt_4_7;
+
 QQmlDebugStream::QQmlDebugStream()
     : QDataStream()
 {
-    setVersion(QQmlDebugServer::s_dataStreamVersion);
+    setVersion(s_dataStreamVersion);
 }
 
 QQmlDebugStream::QQmlDebugStream(QIODevice *d)
     : QDataStream(d)
 {
-    setVersion(QQmlDebugServer::s_dataStreamVersion);
+    setVersion(s_dataStreamVersion);
 }
 
 QQmlDebugStream::QQmlDebugStream(QByteArray *ba, QIODevice::OpenMode flags)
     : QDataStream(ba, flags)
 {
-    setVersion(QQmlDebugServer::s_dataStreamVersion);
+    setVersion(s_dataStreamVersion);
 }
 
 QQmlDebugStream::QQmlDebugStream(const QByteArray &ba)
     : QDataStream(ba)
 {
-    setVersion(QQmlDebugServer::s_dataStreamVersion);
+    setVersion(s_dataStreamVersion);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qml/debugger/qqmldebugservice_p.h b/src/qml/debugger/qqmldebugservice_p.h
index af58168fff..3574f68b7f 100644
--- a/src/qml/debugger/qqmldebugservice_p.h
+++ b/src/qml/debugger/qqmldebugservice_p.h
@@ -111,6 +111,8 @@ private:
 class Q_QML_PRIVATE_EXPORT QQmlDebugStream : public QDataStream
 {
 public:
+    static int s_dataStreamVersion;
+
     QQmlDebugStream();
     explicit QQmlDebugStream(QIODevice *d);
     QQmlDebugStream(QByteArray *ba, QIODevice::OpenMode flags);