From 9691111bcb359fe39e97e13820b98385657ae03a Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Mon, 2 Dec 2019 21:36:46 -0800
Subject: Fix build: remove dependency on Qt private header

The size of QJsonDocument's binary format is well known and we don't
need the header to know what it is. This fixes the build with 5.15,
where the contents of the previous QJsonPrivate namespace are now
in QBinaryJsonPrivate.

web_channel_ipc_transport_host.cpp:148:51: error: 'Header' is not a member of 'QJsonPrivate'

Change-Id: Id7decde0c426479bbf61fffd15dcc5c20a9eca2c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/core/renderer_host/web_channel_ipc_transport_host.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/core/renderer_host/web_channel_ipc_transport_host.cpp b/src/core/renderer_host/web_channel_ipc_transport_host.cpp
index b1aab00a1..9758f73bf 100644
--- a/src/core/renderer_host/web_channel_ipc_transport_host.cpp
+++ b/src/core/renderer_host/web_channel_ipc_transport_host.cpp
@@ -52,10 +52,13 @@
 #include <QJsonObject>
 #include <QLoggingCategory>
 
-#include <QtCore/private/qjson_p.h>
-
 namespace QtWebEngineCore {
 
+enum {
+    // sizeof(QJsonPrivate::Header) + sizeof(QJsonPrivate::Base)
+    MinimumBinaryJsonSize = 8 + 12
+};
+
 Q_LOGGING_CATEGORY(log, "qt.webengine.webchanneltransport")
 
 inline QDebug operator<<(QDebug stream, content::RenderFrameHost *frame)
@@ -145,7 +148,7 @@ void WebChannelIPCTransportHost::DispatchWebChannelMessage(const std::vector<uin
     QJsonDocument doc;
     // QJsonDocument::fromRawData does not check the length before it starts
     // parsing the QJsonPrivate::Header and QJsonPrivate::Base structures.
-    if (binaryJson.size() >= sizeof(QJsonPrivate::Header) + sizeof(QJsonPrivate::Base))
+    if (binaryJson.size() >= MinimumBinaryJsonSize)
         doc = QJsonDocument::fromRawData(reinterpret_cast<const char *>(binaryJson.data()),
                                                                         binaryJson.size());
 
-- 
cgit v1.2.3