delta/qt5/qtwebsockets.git, branch v5.15.0-alpha1 code.qt.io: qt/qtwebsockets.git 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
Merge remote-tracking branch 'origin/5.14' into 5.15 2020-01-28T02:04:57+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2020-01-28T02:04:57+00:00 59a4bc77f412c00968fad729bf3c11c94825545d Change-Id: Iff98ea3277da7e35af6567680d0b84755e30e1af 
Change-Id: Iff98ea3277da7e35af6567680d0b84755e30e1af
Merge remote-tracking branch 'origin/5.14.1' into 5.14 2020-01-27T13:15:33+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2020-01-27T13:15:33+00:00 564ca782a94e389e212bf2fdeeb4be84c54915c0 Change-Id: I84594b23a2703886e96e73758c26f4cecc1370d0 
Change-Id: I84594b23a2703886e96e73758c26f4cecc1370d0
Change QMap to QMultiMap 2020-01-23T12:26:09+00:00 Mårten Nordheim marten.nordheim@qt.io 2020-01-22T14:51:18+00:00 51dd88d8963920b850d79e22b1820d207e0569c7 Because insertMulti is deprecated Change-Id: I3965ea7159b2516b35c45072115eba1ab621b89a Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> 
Because insertMulti is deprecated

Change-Id: I3965ea7159b2516b35c45072115eba1ab621b89a
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Add changes file for Qt 5.14.1 2020-01-21T05:32:06+00:00 Antti Kokko antti.kokko@qt.io 2020-01-09T08:28:07+00:00 ba3acb9d9c7b5234071143d7980576e7eceb6102 + 3aab83b37baf03daa2aa97a708831d1f7dce8de0 Remove extra deleteLater (already done in onSocketDisconnected) + 59ad9ecf70fef2032dea01330d276c1fac20b724 Add binary compatibility file for qtwebsockets 5.14 branch + 737a86f30a78add874b4bff310d4f84f49cc9b50 Bump version Change-Id: I8d784ef67017de93eab7967dac304d14bf1fada3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> 
+ 3aab83b37baf03daa2aa97a708831d1f7dce8de0 Remove extra deleteLater (already done in onSocketDisconnected)
+ 59ad9ecf70fef2032dea01330d276c1fac20b724 Add binary compatibility file for qtwebsockets 5.14 branch
+ 737a86f30a78add874b4bff310d4f84f49cc9b50 Bump version

Change-Id: I8d784ef67017de93eab7967dac304d14bf1fada3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Stop forcing deprecated ssl protocol version 2020-01-17T06:24:08+00:00 Mårten Nordheim marten.nordheim@qt.io 2020-01-16T14:25:46+00:00 e3d919e215d987ec8f912c7cec05ba502d4c3f0b Change-Id: I422a2498bb940f801484d3f2e6e5d59edd637514 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> 
Change-Id: I422a2498bb940f801484d3f2e6e5d59edd637514
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
QWebSocket - do not use deprecated member-function 2020-01-15T15:18:39+00:00 Timur Pocheptsov timur.pocheptsov@qt.io 2020-01-14T10:24:11+00:00 938ad6373415fa8b0767a987c37ce51ec546859f Use 'socketError' instead. Task-number: QTBUG-80369 Change-Id: I30527721677be0fc0f71ca33b08f608472bc8b71 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> 
Use 'socketError' instead.

Task-number: QTBUG-80369
Change-Id: I30527721677be0fc0f71ca33b08f608472bc8b71
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Merge remote-tracking branch 'origin/5.14' into 5.15 2019-12-30T10:19:56+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2019-12-30T10:19:56+00:00 f42b228928c3e51c46bdf0ef855b4832fa59817e Conflicts: .qmake.conf Change-Id: Ic89c6250fae297177b4990de302b4bde71709216 
 Conflicts:
	.qmake.conf

Change-Id: Ic89c6250fae297177b4990de302b4bde71709216
Bump version 2019-12-16T14:23:04+00:00 Daniel Smith daniel.smith@qt.io 2019-12-16T14:23:04+00:00 737a86f30a78add874b4bff310d4f84f49cc9b50 Change-Id: I486dace1520c7fc06e6233da8d1e0a52c7869cdb 
Change-Id: I486dace1520c7fc06e6233da8d1e0a52c7869cdb