Conflicts:
	.qmake.conf

Change-Id: Ic8cd4116fcfa47f7457d8a630274d6745723c858

Task-number: QTBUG-78690
Change-Id: Ie1de2c3cf46edca2b1441ff94a9bb50cb507c057
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

+ 465c6c39 Add changes file for Qt 5.12.5
+ 1deee2a4 Binary compatibility file against Qt5.13.0 for QtWebSockets
+ 24a9e0f9

 wasm: make sendBinaryMessage work in threaded mode

Change-Id: I8a1c4a4cf79b9096c7cc735b936ca64e225faaff
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

Change-Id: I80b008b3cc1cf483656096bade145f05917defb5

And rename the int-version of the getter to enable the scenario where
someone does not have chrono.

From the 5.14 API change review.

Amends 2e54dbe8



Change-Id: Icf2f2a3aebc2216defd0a3a569544c4270ddf05a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

Change-Id: I4052a4c238a0c59b1a0fc01ad3fd6ee6b714595b

This fixes two issues in sendBinaryMessage(), one
observed, and one theoretical:

1) WebSocket send() does not accept data views backed
by SharedArrayBuffer, which is the case for heap memory
views when threading is enabled.

2) We have no way of observing for how long send() will
retain the memory view passed to it. This means we
don’t know when the QByteArray can be safely freed.

Both can be solved by copying the payload data to a
separate ArrayBuffer, whose lifetime can be managed
by WebSocket.

Fixes: QTBUG-78078
Change-Id: I73209080db66f38b971f2c8a727b43402357b1a9
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>

Change-Id: Ibaec93eb5919dd6cc1f34e98ad20c57b9998bc23

Change-Id: Ie2f07797983e53d0a998e1b0f76a8efd951408f7

Change-Id: Id47478b5f9ef4a342771d6e718fd5cd7272f5166

Change-Id: I9c23395dfda8bfaf308dacbf17c471b62803371c

From API review.

Amends 2e54dbe8



Change-Id: Ie55a3ef076e042e4461397996e19bf7d397c3fb5
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>

Gerrit ate my change and somehow created an impossible state where a
patch was able to merge due to its fix but couldn't actually pass its
tests.

Amends 6e1fa958



Task-number: QTBUG-77830
Change-Id: Iedc23616816bb2c1758969a1d76b9536b509c38a
Reviewed-by: Ryan Chu <ryan.chu@qt.io>
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>

If the processing of QWebSocketFrame is not done and waiting for more
data, QWebSocketPrivate::processData should return the control and wait
for next readyRead signal.

Continue the change of b2fc794ffaf48c9d9c401b54cf39ea0220617a27

Change-Id: Idf5af0710267e59e63b8e234d6dab5843d821696
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

Change-Id: I2eaffbe6e9519a78d0f8663c0870f24cb006d222

Since we can have multiple websocket frames in one TCP frame we need
to handle them all.

Partial revert of b14f5f59



Fixes: QTBUG-77830
Change-Id: If435f6e67f04e4817a3202eb8fe779243591bff3
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

BC file added.

Change-Id: Ibc33a9a55c8dc378938046cb3c45c1464864e348
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>

There are missing tests of 'text frame with final bit not set'. After
dataProcessor.process, the spied signals should be compared and cleared
before processing next frame.

Change-Id: I5737da9d57e0043cfedb400f4e0934c5ce7c4250
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

Asynchronously process socket frame in QWebSocketDataProcessor::process.
If the processing of QWebSocketFrame is not done and waiting for more
data, QWebSocketDataProcessor::process will return the control and wait
for next readyRead signal to continue processing the unfinished socket
frame. QWebSocketDataProcessor::process gets timeout after 5 seconds,
and then an errorEncountered signal will be emitted.

Fixes: QTBUG-74464
Change-Id: I03b7f874c1c266617e7eadf59c59ae43fa8540ce
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

The static function QWebSocketFrame::readFrame used to return a parsed
QWebSocketFrame read from QIODevice. This change make QWebSocketFrame
reusable. It will base on its internal state and keep processing the
incoming data from QIODevice.

Change-Id: Ic6dea59529fa935cdb8034519e633ea67e869674
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

The macro 'WAIT_FOR_MORE_DATA' is revised because the processing
state is kept by m_processingState. Remove the unused dataWaitSize and
returnState local variables from QWebSocketFrame::readFrame.

Change-Id: I8e270c5c7117b170159d4fb3b2bf1531a9cd5334
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

To reduce the dependency of each state and remove local variables
(bytesRead, hasMask, and payloadLength) from QWebSocketFrame::readFrame,
this change breaks down the states of QWebSocketFrame::readFrame into
subroutines. In this change, it uses a readFramePayloadLength function
to handle PS_READ_PAYLOAD_LENGTH and PS_READ_BIG_PAYLOAD_LENGTH cases.
In addition, a missing error-handling is added in the read-header case
if the bytesAvailable is less than 2 bytes.

The variable hasMask is replaced by transiently using m_mask to
indicate whether to read a mask. After reading mask in readFrameMask,
the transient value will be over-written and used in readFramePayload.

To replace local variable payloadLength with QWebSocketFrame::m_length,
m_length is expanded to hold the payload length.

Change-Id: I1c2d197112cef5cea75215923fa28e6f2e6cbef8
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

The use of QTime for determining intervals is deprecated:
qwebsocket_p.cpp:1214:61: warning: ‘int QTime::elapsed() const’ is deprecated: Use QElapsedTimer instead [-Wdeprecated-declarations]

Change-Id: I26e1dabcba5ba54a4fead02b43c3fe7ace740be0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

+ dcf08a4c

 Bump version

Change-Id: Ia81f727e8ee826590cd33fbb3ad2086e6e7ca2da
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

Pass a template argument to std::less/greater.

Amends 54ffd0d0

.

Fixes: QTBUG-77500
Change-Id: I0b78906090d8b0e3c910104975c08ff79ba9fc12
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

+ 69f3b6ed Bump version
+ 9db762ad Add changes file for Qt 5.12.4
+ 34c8622d Doc: Complete parameter description several methods
+ 44750221 Bump version
+ dcf08a4c Bump version
+ 9fcd04fc

 Doc: Replace example file lists with links to code.qt.io

Change-Id: Ib6157dc6112e10ffea0e72b320a0402a250905d6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

Change-Id: Ifa55b6563a15a91d7906d9e84936c4484323f809

 Conflicts:
	.qmake.conf

Change-Id: I1c65346e0625bb1653fa02ed87fd7999608f5482

 Conflicts:
	.qmake.conf

Change-Id: I3970191eef4be34b82487a6761999d79cccd0c20

Task-number: QTBUG-74391
Change-Id: I4f5a70c7439b27db2b02907e460b5804d5c6e104
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

Change-Id: I9b5b43a7646d121ceacbd7006841f8bc4cb9f5ca

Change-Id: I8d070d15c9c87e68354fa2bd848b465dc86ad8cc