Merge remote-tracking branch 'origin/5.8' into dev

Blacklist tst_QMenuBar::taskQTBUG46812_doNotLeaveMenubarHighlighted() on macOS.

Conflicts:
	mkspecs/features/mac/default_post.prf
	mkspecs/features/mac/sdk.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/sdk.prf
	src/angle/src/libEGL/libEGL.pro
	src/platformsupport/fontdatabases/fontdatabases.pro
	src/platformsupport/platformsupport.pro
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	tests/auto/widgets/widgets/qmenubar/BLACKLIST
	tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp

Task-number: QTBUG-56853
Change-Id: If58785210feee3550892fc7768cce90e75a2416c

1 files changed, 17 insertions, 18 deletions

diff --git a/src/network/access/http2/http2frames_p.h b/src/network/access/http2/http2frames_p.h
index 84ba9c3662..e5f6d46c67 100644
--- a/src/network/access/http2/http2frames_p.h
+++ b/src/network/access/http2/http2frames_p.h
@@ -71,27 +71,29 @@ namespace Http2
 struct Q_AUTOTEST_EXPORT Frame
 {
     Frame();
-    // Reading these values without first forming a valid frame
-    // (either reading it from a socket or building it) will result
-    // in undefined behavior:
+    // Reading these values without first forming a valid frame (either reading
+    // it from a socket or building it) will result in undefined behavior:
     FrameType type() const;
     quint32 streamID() const;
     FrameFlags flags() const;
     quint32 payloadSize() const;
     uchar padding() const;
-    // In HTTP/2 a stream's priority is specified by its weight
-    // and a stream (id) it depends on:
+    // In HTTP/2 a stream's priority is specified by its weight and a stream
+    // (id) it depends on:
     bool priority(quint32 *streamID = nullptr,
                   uchar *weight = nullptr) const;
 
     FrameStatus validateHeader() const;
     FrameStatus validatePayload() const;
 
-    // Number of payload bytes without padding and/or priority
+    // Number of payload bytes without padding and/or priority.
     quint32 dataSize() const;
-    // Beginning of payload without priority/padding
-    // bytes.
+    // HEADERS data size for HEADERS, PUSH_PROMISE and CONTINUATION streams:
+    quint32 hpackBlockSize() const;
+    // Beginning of payload without priority/padding bytes.
     const uchar *dataBegin() const;
+    // HEADERS data beginning for HEADERS, PUSH_PROMISE and CONTINUATION streams:
+    const uchar *hpackBlockBegin() const;
 
     std::vector<uchar> buffer;
 };
@@ -134,8 +136,7 @@ public:
     void setFlags(FrameFlags flags);
     void addFlag(FrameFlag flag);
 
-    // All append functions also update frame's payload
-    // length.
+    // All append functions also update frame's payload length.
     template<typename ValueType>
     void append(ValueType val)
     {
@@ -161,16 +162,14 @@ public:
 
     // Write as a single frame:
     bool write(QAbstractSocket &socket) const;
-    // Two types of frames we are sending are affected by
-    // frame size limits: HEADERS and DATA. HEADERS' payload
-    // (hpacked HTTP headers, following a frame header)
-    // is always in our 'buffer', we send the initial HEADERS
+    // Two types of frames we are sending are affected by frame size limits:
+    // HEADERS and DATA. HEADERS' payload (hpacked HTTP headers, following a
+    // frame header) is always in our 'buffer', we send the initial HEADERS
     // frame first and then CONTINUTATION frame(s) if needed:
     bool writeHEADERS(QAbstractSocket &socket, quint32 sizeLimit);
-    // With DATA frames the actual payload is never in our 'buffer',
-    // it's a 'readPointer' from QNonContiguousData. We split
-    // this payload as needed into DATA frames with correct
-    // payload size fitting into frame size limit:
+    // With DATA frames the actual payload is never in our 'buffer', it's a
+    // 'readPointer' from QNonContiguousData. We split this payload as needed
+    // into DATA frames with correct payload size fitting into frame size limit:
     bool writeDATA(QAbstractSocket &socket, quint32 sizeLimit,
                    const uchar *src, quint32 size);
 private: