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>

1 files changed, 4 insertions, 5 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);