delta/qt5/qtwebsockets.git, branch v5.15.0-beta2 code.qt.io: qt/qtwebsockets.git Stabilize tst_QWebSocketServer::tst_handshakeTimeout 2020-03-10T08:07:16+00:00 Mårten Nordheim marten.nordheim@qt.io 2020-03-09T16:38:46+00:00 ad75d2712a838787488e817eec318fc27bae1786 The test was a bit flaky which seems to have been due to the short timeout. Increase the timeout a considerable amount, it doesn't matter much to the runtime anyway: the test still takes around 5 seconds to finish. Fixes: QTBUG-82559 Change-Id: Ie14ea204de1cc7ac2951144099d5be88adebef04 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> 
The test was a bit flaky which seems to have been due to the short
timeout. Increase the timeout a considerable amount, it doesn't matter
much to the runtime anyway: the test still takes around 5 seconds to
finish.

Fixes: QTBUG-82559
Change-Id: Ie14ea204de1cc7ac2951144099d5be88adebef04
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Use Qt::SplitBehavior in preference to QString::SplitBehavior 2020-03-02T14:56:34+00:00 Edward Welbourne edward.welbourne@qt.io 2020-02-25T15:03:28+00:00 5bc1a1f85fedd7d65298f0a4c8ea79fb0670c0d7 The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: If65be10a7c86e7b4173fd31f1d277c63c6accb0a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
The Qt version was added in 5.14 "for use as eventual replacement for
QString::SplitBehavior." Move another step closer to that goal.

Change-Id: If65be10a7c86e7b4173fd31f1d277c63c6accb0a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Revert "QWebSocket - do not use deprecated member-function" 2020-02-27T11:08:58+00:00 Allan Sandfeld Jensen allan.jensen@qt.io 2020-02-27T09:51:39+00:00 87c9513aed424f0c97a78271f59a34873cc7e522 This reverts commit 938ad6373415fa8b0767a987c37ce51ec546859f. Reason for revert: Was undeprecated and replacement removed Change-Id: I79d6e931d72ec518a43fe058e1067b3754f6cf05 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> 
This reverts commit 938ad6373415fa8b0767a987c37ce51ec546859f.

Reason for revert: Was undeprecated and replacement removed

Change-Id: I79d6e931d72ec518a43fe058e1067b3754f6cf05
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
WebSocketServer: Add Q_(UN)LIKELY 2020-02-26T10:03:54+00:00 Andre Hartmann aha_1980@gmx.de 2020-02-23T16:00:44+00:00 a844995bb8b48c08c5f6180b727c8f45bd23dfa5 ... to optimize code that is used for error handling. Change-Id: I62fe11d34d32c6784e960505fccbf529a3265d23 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> 
... to optimize code that is used for error handling.

Change-Id: I62fe11d34d32c6784e960505fccbf529a3265d23
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Update plugins.qmltypes for 5.15 2020-02-25T11:55:31+00:00 Jani Heikkinen jani.heikkinen@qt.io 2020-02-25T09:59:57+00:00 a246fb2ae2a810b62147cf64d96410a26b93e637 Task-number: QTBUG-82253 Change-Id: I90199c05f683df18dffe796227fc8e4c0ef9f72d Reviewed-by: Kai Koehne <kai.koehne@qt.io> 
Task-number: QTBUG-82253
Change-Id: I90199c05f683df18dffe796227fc8e4c0ef9f72d
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Merge remote-tracking branch 'origin/5.14' into 5.15 2020-02-25T02:01:17+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2020-02-25T02:01:17+00:00 2e7f2cc29454859ccd7b36e487f5970407d353b0 Change-Id: I69ac9d8a828ba664e38b1f5abdfd0830f55c134e 
Change-Id: I69ac9d8a828ba664e38b1f5abdfd0830f55c134e
Doc: fix missing closing comment 2020-02-24T05:08:45+00:00 Andre Hartmann aha_1980@gmx.de 2020-02-23T14:56:59+00:00 9d3eb184c72333a95ee8f9ee33bd51942271de64 Change-Id: I2e1f4893b1b4c1270630101c390b937611e5d5e2 Reviewed-by: Paul Wicking <paul.wicking@qt.io> 
Change-Id: I2e1f4893b1b4c1270630101c390b937611e5d5e2
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Doc: fix links to autobahn testsuite 2020-02-24T05:08:25+00:00 Andre Hartmann aha_1980@gmx.de 2020-02-23T14:57:28+00:00 7554e8839ac230b08a0b670c31a4843ba1f17cb1 Fixes: QTBUG-69425 Change-Id: I28e03da927c7a9b1cbfb91a0aca32866c2e653ea Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> 
Fixes: QTBUG-69425
Change-Id: I28e03da927c7a9b1cbfb91a0aca32866c2e653ea
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Merge remote-tracking branch 'origin/5.14' into 5.15 2020-02-05T12:34:19+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2020-02-05T12:34:19+00:00 127d475324c2133b8d7e2f4712e71d14fa84c560 Conflicts: .qmake.conf Change-Id: I2bae5688cc62bffed1cfccc45e7129cf00a769f8 
 Conflicts:
	.qmake.conf

Change-Id: I2bae5688cc62bffed1cfccc45e7129cf00a769f8
Bump version 2020-02-02T12:42:34+00:00 Alexandru Croitor alexandru.croitor@qt.io 2020-02-02T12:42:34+00:00 2d10eaba1607f3efaaf3020e4b7c57a31060177e Change-Id: Ibcb0063877543a2cb09ded212e0940fb45280c71 
Change-Id: Ibcb0063877543a2cb09ded212e0940fb45280c71