delta/qt5/qtwebsockets.git, branch wip/cmake code.qt.io: qt/qtwebsockets.git CMake: Regenerate projects after merge 2020-03-23T15:08:34+00:00 Alexandru Croitor alexandru.croitor@qt.io 2020-03-23T15:03:25+00:00 a674d83d75a1f80fee8de63f8a5e2aadab931124 Change-Id: I3cdf755e3aae933016b9719ce4c61f53e554ea48 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> 
Change-Id: I3cdf755e3aae933016b9719ce4c61f53e554ea48
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Merge remote-tracking branch 'origin/dev' into wip/cmake 2020-03-23T15:00:29+00:00 Alexandru Croitor alexandru.croitor@qt.io 2020-03-23T15:00:29+00:00 6b19edaefe7edcdc12a1faa269d77e42a14fc81d Conflicts: dependencies.yaml Change-Id: I1608720522e974c7107f00599a9fb70f17865189 
 Conflicts:
	dependencies.yaml

Change-Id: I1608720522e974c7107f00599a9fb70f17865189
Update dependencies on 'dev' in qt/qtwebsockets 2020-03-20T07:34:37+00:00 Qt Submodule Update Bot qt_submodule_update_bot@qt-project.org 2020-03-20T07:34:33+00:00 8fc139318b2f870aa633e93874b3fa6e9d1113ae Change-Id: I62f1a9ffdf5a54e1a89291714bfd7ca7cc0a86db Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
Change-Id: I62f1a9ffdf5a54e1a89291714bfd7ca7cc0a86db
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Update dependencies on 'dev' in qt/qtwebsockets 2020-03-19T12:07:09+00:00 Qt Submodule Update Bot qt_submodule_update_bot@qt-project.org 2020-03-19T12:07:03+00:00 6739d8dc1b51149b00aa127ebdd1e9b74e6223b9 Change-Id: Ic8e16f462502d87f12a527977ea278c042e89658 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
Change-Id: Ic8e16f462502d87f12a527977ea278c042e89658
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Merge "Merge remote-tracking branch 'origin/5.15' into dev" 2020-03-18T10:56:45+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2020-03-18T10:56:39+00:00 4e14b6b6fe22011c01cf6ec9fad8f3536b288d13 






Merge remote-tracking branch 'origin/5.15' into dev
2020-03-18T10:56:39+00:00

Qt Forward Merge Bot
qt_forward_merge_bot@qt-project.org

2020-03-18T10:56:39+00:00

79f3f76ac60e656683a2ef8ac4e82bc64d742337

Change-Id: I2214c13d1dab22dece20b536454833672faa6296





Change-Id: I2214c13d1dab22dece20b536454833672faa6296







Update dependencies on 'dev' in qt/qtwebsockets
2020-03-17T11:55:56+00:00

Qt Submodule Update Bot
qt_submodule_update_bot@qt-project.org

2020-03-17T11:55:51+00:00

5778652ada0763deb6a61479b2410e1f68542ce9

Change-Id: I1c3b51d459c8832919cc0bee42c4f453391c0a1d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>





Change-Id: I1c3b51d459c8832919cc0bee42c4f453391c0a1d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>







Update dependencies on 'dev' in qt/qtwebsockets
2020-03-10T08:27:54+00:00

Qt Submodule Update Bot
qt_submodule_update_bot@qt-project.org

2020-03-10T08:27:49+00:00

0dab7975d64720f08c2263e87f45dd198c93853f

Change-Id: I04b1a767b9a9cdf4d21ec5ecce4318fffca580c4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>





Change-Id: I04b1a767b9a9cdf4d21ec5ecce4318fffca580c4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>







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>







Merge remote-tracking branch 'origin/5.15' into dev
2020-03-07T02:02:05+00:00

Qt Forward Merge Bot
qt_forward_merge_bot@qt-project.org

2020-03-07T02:02:05+00:00

5615716a63f4994a1a82cc363c49f314e0a84332

Change-Id: Ib31d3b50e4498cdfc55b68ebc5993750b5ee7ce1





Change-Id: Ib31d3b50e4498cdfc55b68ebc5993750b5ee7ce1