Wrap system information in sysinfo key

Refactors the code to allow sending configuration values during
connection. There is no need to delete the type from the connect
object any more.

Change-Id: Ide5df8fd77ddf556558f387d2846f927ac50e716
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

2 files changed, 16 insertions, 10 deletions

diff --git a/src/plugins/platforms/webgl/qwebglwebsocketserver.cpp b/src/plugins/platforms/webgl/qwebglwebsocketserver.cpp
index 78851b3..debdbf8 100644
--- a/src/plugins/platforms/webgl/qwebglwebsocketserver.cpp
+++ b/src/plugins/platforms/webgl/qwebglwebsocketserver.cpp
@@ -286,14 +286,19 @@ void QWebGLWebSocketServer::onNewConnection()
                 &QWebGLWebSocketServer::onTextMessageReceived);
 
         const QVariantMap values{
-            { QStringLiteral("buildAbi"), QSysInfo::buildAbi() },
-            { QStringLiteral("buildCpuArchitecture"), QSysInfo::buildCpuArchitecture() },
-            { QStringLiteral("currentCpuArchitecture"), QSysInfo::currentCpuArchitecture() },
-            { QStringLiteral("kernelType"), QSysInfo::kernelType() },
-            { QStringLiteral("machineHostName"), QSysInfo::machineHostName() },
-            { QStringLiteral("prettyProductName"), QSysInfo::prettyProductName() },
-            { QStringLiteral("productType"), QSysInfo::productType() },
-            { QStringLiteral("productVersion"), QSysInfo::productVersion() }
+            { "sysinfo",
+                QVariantMap {
+                    { QStringLiteral("buildAbi"), QSysInfo::buildAbi() },
+                    { QStringLiteral("buildCpuArchitecture"), QSysInfo::buildCpuArchitecture() },
+                    { QStringLiteral("currentCpuArchitecture"),
+                      QSysInfo::currentCpuArchitecture() },
+                    { QStringLiteral("kernelType"), QSysInfo::kernelType() },
+                    { QStringLiteral("machineHostName"), QSysInfo::machineHostName() },
+                    { QStringLiteral("prettyProductName"), QSysInfo::prettyProductName() },
+                    { QStringLiteral("productType"), QSysInfo::productType() },
+                    { QStringLiteral("productVersion"), QSysInfo::productVersion() }
+                }
+            }
         };
 
         sendMessage(socket, MessageType::Connect, values);
diff --git a/src/plugins/platforms/webgl/webqt.jsx b/src/plugins/platforms/webgl/webqt.jsx
index a96e8cd..5d8eb2a 100644
--- a/src/plugins/platforms/webgl/webqt.jsx
+++ b/src/plugins/platforms/webgl/webqt.jsx
@@ -1183,8 +1183,9 @@ window.onload = function () {
         } else if (obj.type === "change_title") {
             document.title = obj.text;
         } else if (obj.type === "connect") {
-            var sysinfo = obj;
-            delete sysinfo["type"];
+            var sysinfo = obj["sysinfo"];
+            if (obj["debug"])
+                DEBUG = 1;
             console.log(sysinfo);
         } else {
             console.error("Unknown message type");