summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2' in qt/qtwebsockets6.2Qt Submodule Update Bot2022-04-011-2/+2
| | | | | Change-Id: Iada291b8fc8dfe4c483db941554b3a34626e48cf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Blacklist: test cases blacklisted in tst_QWebSocketServer:"Pasi Petäjäjärvi2022-04-011-4/+0
| | | | | | | | | | This reverts commit 2b379a41a55a89673643b0a39c6e2f93db7fc632. Reason for revert: Should not have been merged Task-number: QTBUG-101333 Change-Id: I3ce0bfe544002363400f32f5a2304c310978dc49 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* tst_QWebSocket: fix scope of ifdef proxy-checkMårten Nordheim2022-03-311-2/+1
| | | | | | | | | | Because other tests had made their way inside Change-Id: Ie6fa545a84c2f66e0c2617f498118a3e04eedd0c Reviewed-by: Arno Rehn <a.rehn@menlosystems.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit ebf82dc805354e8d9b1c2f0a45bad6594dbbbd22) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2022-03-311-2/+2
| | | | | Change-Id: I6518e504dd279a5d4a493ef9e5b79bbb5af99e51 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2022-03-241-2/+2
| | | | | Change-Id: I7f3618c1e741747b0316c85f17192cae7ac6c97f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2022-03-151-2/+2
| | | | | Change-Id: I3003df61bf8e6ecb0bc3a3dbbdc8e205a1c541e5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2022-03-141-2/+2
| | | | | Change-Id: Ibe52ebd84c1f65f5ff3f6228e9a6227447e8de91 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2022-03-101-2/+2
| | | | | Change-Id: I192da17583a4e79c9627fa4589f024fe69adf218 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2022-03-081-2/+2
| | | | | Change-Id: I8c0a21d8c353ffe76cb0a359e1c4ff4efb9172ce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2022-03-041-2/+2
| | | | | Change-Id: Ic52c3f2ff7f29027bf2408464a9e4da845305e72 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Blacklist: test cases blacklisted in tst_QWebSocketServer:CI Insignificant Platforms Monitor Bot2022-03-011-0/+4
| | | | | | | | | | - tst_handleConnection on qnx Task-number: QTBUG-101333 Change-Id: If81ec4cb7099063d9b000221aca521579979653c Reviewed-by: CI Insignificant Platforms Monitor Bot <ci_insignificant_platforms_monitor_bot@qt.io> (cherry picked from commit 1d0767f546db7db839029d1f51196dc0f60390ae) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2022-02-171-2/+2
| | | | | Change-Id: I9cd55a86137004054c0e5f8f3f82859fe5c71da1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2022-02-101-2/+2
| | | | | Change-Id: I06c12fa3f0bb1234f830b069a323af18ca471e68 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Switch examples to build as isolated sub-builds part 2Alexandru Croitor2022-02-051-1/+1
| | | | | | | | | | | | | | | | qt_examples_build_begin needs the EXTERNAL_BUILD flag to know that it's safe to build examples as ExternalProjects. It still won't do it in CI until we enable building examples as ExternalProjects for prefix builds. This is preparation for that. Task-number: QTBUG-90820 Change-Id: I20c9ce497ef32295bab9876caa5ea12dcc68896d Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 58971921444adced1f50c94f7c42f168ac5fcaff) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix order of signals around disconnectionJoni Poikelin2022-02-011-3/+1
| | | | | | | | | | | | | | | | | readyRead() signal had been connected with QueuedConnection which caused disconnected() signal to sometimes come before last message signals of a connection. Reasoning for this was some issue regarding SSL sockets, but there is a good chance it has been fixed since then. Removing this doesn't seem to cause hangs now at least. Fixes: QTBUG-100054 Change-Id: Id465916d111a5520f4039cf57f822918f3afbca0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit e1c92b57485e685bac6884cca43e152faf9d2d2b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2022-02-011-2/+2
| | | | | Change-Id: Ia574588735c9eb991998082815a187743ce7c6f4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.2.4Jani Heikkinen2022-02-012-2/+2
| | | | | Change-Id: I588d90e53c31691113d9d8159ea3fe89f59e996d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2022-01-201-2/+2
| | | | | Change-Id: I3e1674b45d4fdfcf5305c1addc5e64672ac2e22d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2022-01-191-2/+2
| | | | | Change-Id: I3f32ea03a15d3485f72735d779142e51c8fc8a68 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix setting of socket optionsJoni Poikelin2022-01-121-4/+8
| | | | | | | | | Socket options need to be set after connectToHost() to take any effect. Change-Id: I006a8c59ba1c78d5edaa77d545bb0f640b7224fe Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 647922b1122977625b8f32fbc0bb2e9339afb4a3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Re-enable cmake build test for qtwebsocketsJuha Vuolle2022-01-122-8/+36
| | | | | | | | Task-number: QTBUG-92967 Change-Id: I2c138fd2614c08936e4253ec58c82d282cd726f3 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 8d7d0c16302597f36a45da83f92ff7e003cbfd1c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2022-01-041-2/+2
| | | | | Change-Id: I41d328b053bc9239483829e9aee3bb7cc20e9d1e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2022-01-031-2/+2
| | | | | Change-Id: I8b751d8e8e4e6cb648d9b8f4c7b13adffdc95e49 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.2.3Jani Heikkinen2021-12-182-2/+2
| | | | | Change-Id: I96ad2709009ae2e7c80dae216d0850dd475e7391 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-12-181-2/+2
| | | | | Change-Id: If42304d044ec0f3425b014ab2586a164ef57f632 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QWebSocketProtocol: fix potential UB (signed overflow) in masking operationMarc Mutz2021-12-171-1/+1
| | | | | | | | | | | | | The size of the payload is a 64-bit integer, which the loop counts down. If the size is > INT_MAX, then we'll overflow the int i used to track the current position in the mask. Fix by using an unsigned integer type instead. Change-Id: Ia3b8d42ae906eb03c1c7399cb1137a08121fcde3 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 38218494a65049b5f9da7a8aab012a969c7dac86) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Switch examples to build as isolated sub-buildsAlexandru Croitor2021-12-151-7/+7
| | | | | | | | Task-number: QTBUG-90820 Change-Id: Iac4cb61d45a9ca0d19ebc1f43bf281cb2dc52f10 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 8b0d5814b500545e71a0698c52dc48f5201b67fa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-12-131-2/+2
| | | | | Change-Id: Ia83f4eb03e871805ee98e6f99fd0b11cf3720b2d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-12-111-2/+2
| | | | | Change-Id: Id80d3411a8835f667fbe109b00cbb424edb41bad Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-12-111-2/+2
| | | | | Change-Id: I46345a805afa3ef61ee2d66cb2c9bc48eb0fc019 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-12-101-2/+2
| | | | | Change-Id: I69c71a95e81bc234d034fc8d07a71adcb2ada6a7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add missing FDL license fileKai Köhne2021-12-021-0/+451
| | | | | | | | | This is referenced in the .qdoc license headers. Change-Id: I96f079c2f6c1d565f80da926ac901cd1b4734300 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit d46733fe16a51cbed5e9aecae4b75c7c4d5a421d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-11-301-2/+2
| | | | | Change-Id: If5322922ff95261dc7d81104007084d2cac38347 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-11-291-2/+2
| | | | | Change-Id: Idb6965ac6a13ffcaefbbc0f45f906ee2b4606572 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-11-281-2/+2
| | | | | Change-Id: I3d4b27b114e0ba82261fe03bea0be03195a68f83 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-11-091-2/+2
| | | | | Change-Id: I181a11dd7174d0912884421e40476592c06072eb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-11-051-2/+2
| | | | | Change-Id: I7c8412c3947255b0cc8266d1276030692c5a9810 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-11-041-2/+2
| | | | | Change-Id: I2a626c6e337968c53302029d125cdb7f6db2c455 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.2.2Jani Heikkinen2021-11-032-2/+2
| | | | | Change-Id: I319b967134d578035bfb6b7c3992bde4eb5683ee Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-11-031-2/+2
| | | | | Change-Id: Ieb5fa4f08af5d25f92fb07f40989d7cf654dbfea Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-11-011-2/+2
| | | | | Change-Id: I30aa57b823577a5a13cc72df3358bc976eaa8cdd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-10-291-2/+2
| | | | | Change-Id: Ic72ffff64d6d5ea235811d95b8e7d8a73460ec91 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-10-281-2/+2
| | | | | Change-Id: I02bdfaa0b791617f418fe1f733d715b87aaa2c20 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-10-271-2/+2
| | | | | Change-Id: I149a7fc0373de95b1913fe982d079ebf3a63c7e1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-10-261-2/+2
| | | | | Change-Id: Ia2f81b7720c0cbd71cb700eabadc4063fce1a4f3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-10-261-2/+2
| | | | | Change-Id: I00ecc2b60f2c60013abf52d176d416a238361dda Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-10-251-2/+2
| | | | | Change-Id: I04fcf0c3bb5d3b3feb9989a83bb76f4332b2784a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-10-251-2/+2
| | | | | Change-Id: I75e076944b9195c6b426a24779491cd59b8b84e4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix typo in \qtcmakepackage commandPaul Wicking2021-10-211-1/+1
| | | | | | | | | | The correct CMake package name is WebSockets Fixes: QTBUG-97681 Change-Id: I434cfce2e0d7fb91534718becb953a1b94e16d16 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit bb0a0e8f296c455f8e528e93adfb8bd071e86470) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-10-201-2/+2
| | | | | Change-Id: Ibc9462a8ed624824e1e9f1f154741d38a8f70eca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
View Lorry Controller Status