delta/qt5/qtwebsockets.git, branch v5.10.0-rc2 code.qt.io: qt/qtwebsockets.git Merge remote-tracking branch 'origin/5.9.3' into 5.10.0 2017-11-21T10:05:47+00:00 Liang Qi liang.qi@qt.io 2017-11-21T10:05:47+00:00 0e4b43383dd826b5927f6276033f52ede1fa7936 Change-Id: I3ac04c00c6da760a0125970c55866055709a3371 
Change-Id: I3ac04c00c6da760a0125970c55866055709a3371
Add changes file for Qt 5.10.0 2017-11-14T05:58:13+00:00 Antti Kokko antti.kokko@qt.io 2017-11-08T11:12:34+00:00 57e1ebecf0e9e1fbc23f7fe32a90c63e242e692b Change-Id: Ie9ff1794bd623c46ae895d75a6016cd56dec9576 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> 
Change-Id: Ie9ff1794bd623c46ae895d75a6016cd56dec9576
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Add changes file for Qt 5.9.3 2017-11-08T12:48:57+00:00 Antti Kokko antti.kokko@qt.io 2017-11-02T11:52:49+00:00 67f6e5e282c21495794741dd2242e4965b716b96 Change-Id: I84dc0e201d92f1ad86565155e25f28a9ef5c5a9b Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> 
Change-Id: I84dc0e201d92f1ad86565155e25f28a9ef5c5a9b
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Update to new QRandomGenerator API 2017-11-03T09:13:15+00:00 Thiago Macieira thiago.macieira@intel.com 2017-10-25T03:46:22+00:00 7e853bcd05cbc955b71843586ee20158e6ed3091 Change-Id: I69f37f9304f24709a823fffd14e676c097712329 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> 
Change-Id: I69f37f9304f24709a823fffd14e676c097712329
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Merge remote-tracking branch 'origin/5.9' into 5.10 2017-10-30T07:46:31+00:00 Liang Qi liang.qi@qt.io 2017-10-30T07:46:31+00:00 a99beb2c7b5867aac0e5ae997042cc88c0f6a175 Change-Id: I3ae5df71f201cfdb9a4c9e7d90a60d1f9792700a 
Change-Id: I3ae5df71f201cfdb9a4c9e7d90a60d1f9792700a
Fix empty sslConfiguration in sslErrors slot 2017-10-27T14:58:36+00:00 André Klitzing aklitzing@gmail.com 2017-10-19T14:05:17+00:00 203da360c4bcd64bdd17639d495f1857b622e92d If QWebSocket fires signal sslErrors the QSslConfiguration of QWebSocket is not updated. So client application cannot check it in implemented slot. Fix this by calling the update method like for encrypted signal. Sibling of QTBUG-40401. Change-Id: I18b39f6b6a0791ae67fc2bff5cf2c04a22b0ab85 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> 
If QWebSocket fires signal sslErrors the
QSslConfiguration of QWebSocket is not updated.
So client application cannot check it in
implemented slot.

Fix this by calling the update method like
for encrypted signal.

Sibling of QTBUG-40401.

Change-Id: I18b39f6b6a0791ae67fc2bff5cf2c04a22b0ab85
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Check count of spy to verify signal 2017-10-27T14:58:30+00:00 André Klitzing aklitzing@gmail.com 2017-10-23T09:29:19+00:00 905a6cea6c205015445bcd11c8f2616576a092c5 Looks like QVERIFY(spy.wait()) is a little bit flaky. We should check the count of the spy if it was successful instead of the return value of wait since wait will return false even if the signal was delivered before the call to wait(). Change-Id: I5f9031685dfa69b00155fa22602bab998843cb68 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> 
Looks like QVERIFY(spy.wait()) is a little bit flaky. We should
check the count of the spy if it was successful instead of the
return value of wait since wait will return false even if the signal
was delivered before the call to wait().

Change-Id: I5f9031685dfa69b00155fa22602bab998843cb68
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Fix handshakeReceived not being invoked in some situation 2017-10-27T11:45:38+00:00 Mårten Nordheim marten.nordheim@qt.io 2017-10-27T10:29:52+00:00 f88def9086fa3a546847034dd017c0e5bdd92ab8 In the rare case where the handshake was received before the signal and slot was connected it would never invoke handshakeReceived and the server would keep waiting. Task-number: QTBUG-64026 Change-Id: I86d54031d2583b6a0cf2b5348889b5ef859b9aab Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> 
In the rare case where the handshake was received before the signal and
slot was connected it would never invoke handshakeReceived and the
server would keep waiting.

Task-number: QTBUG-64026
Change-Id: I86d54031d2583b6a0cf2b5348889b5ef859b9aab
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Fix outdated FDL license header 2017-10-23T07:56:15+00:00 Kai Koehne kai.koehne@qt.io 2017-09-28T15:00:20+00:00 e962127cb9afbd3cf59d80931b76b1e6800f146f Change-Id: Ic41f3745e800ba54153b36f269017075297c2402 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> 
Change-Id: Ic41f3745e800ba54153b36f269017075297c2402
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Merge remote-tracking branch 'origin/5.9' into 5.10 2017-10-11T13:42:27+00:00 Liang Qi liang.qi@qt.io 2017-10-11T13:42:27+00:00 cd26439ac7ca1a444e9b5534a504afb0bb411890 Conflicts: .qmake.conf Change-Id: I4af142703e469b56236b73335a93f6960534c0f1 
 Conflicts:
	.qmake.conf

Change-Id: I4af142703e469b56236b73335a93f6960534c0f1