aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-03-041-2/+2
| | | | | Change-Id: I2aca77ffe84178ab00296b5c29d4fd2cc4cc7784 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.3' in qt/qtwebsocketsQt Submodule Update Bot2022-02-231-2/+2
| | | | | Change-Id: I1738abd9cda30fe9562effd36c046cb8480a38df Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-02-211-2/+2
| | | | | Change-Id: I903a49cb893ad3745ffc166a5f261e16aa5e75ef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Improve examples CMakeLists.txtKai Köhne2022-02-199-70/+28
| | | | | | | | | | | | | | | | | | - Remove "# generated from xyz.pro" comment from pro2cmake - Remove automatic use of CMAKE_AUTORCC - Only opt into CMAKE_AUTOUIC if .ui files are involved - Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR - Combine multiple find_package(Qt6 ... calls) - use REQUIRED COMPONENTS - sort components alphabetically - Fix wrong indentations - Use (only) one empty line after multi-line commands Change-Id: I03507e56c961cfd6ae138473437dfafe478d3233 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit fef6885a446165a02973c84469c87bebae389b96) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-02-161-2/+2
| | | | | Change-Id: I782a8803a317531208cae095eca687d8faeaa682 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsv6.3.0-beta2Qt Submodule Update Bot2022-02-121-2/+2
| | | | | Change-Id: I4e35245d65667d4667fb824c7055c8970c35e78a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-02-091-2/+2
| | | | | Change-Id: I4c9832df1966577ab6c7ae0915b9f74a45b8f8d5 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.3' in qt/qtwebsocketsv6.3.0-beta1Qt Submodule Update Bot2022-01-311-2/+2
| | | | | Change-Id: I3a533ff09547f3baf103fe13b854be61af92473b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-01-261-2/+2
| | | | | Change-Id: Idcfc14589445a1fb37dac4815e1d768bd0dbaa2a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-01-241-2/+2
| | | | | Change-Id: I4b875d538548542893d1db308b832ddfdb2a0775 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-01-181-2/+2
| | | | | Change-Id: I1b0137dbe3a53c46507eaeb2514790385d42906f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-01-131-2/+2
| | | | | Change-Id: I2887c377b4fbf9f3af5c05ba7e9a5fcc7d558bbd 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.3' in qt/qtwebsocketsv6.3.0-alpha1Qt Submodule Update Bot2022-01-081-2/+2
| | | | | Change-Id: I53fa46dbbed37a5dda603fca0743aec75b44ff2f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-01-061-2/+2
| | | | | Change-Id: Ieea7a2bd143a0f5c14ad3dc60d9e46f556918543 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2021-12-221-2/+2
| | | | | Change-Id: Iabd9c28d83fe0eab6dc9c676463497fdcf5a3448 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2021-12-211-2/+2
| | | | | Change-Id: Id71b9817871000bd4adc0b6ccb7719125886c7ef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Port QWebSocketProtocol::versionFromString() to QStringViewMarc Mutz2021-12-173-4/+5
| | | | | | | | | | It's not public API, so there's no point in using QAnyStringView here. We control all callers. Change-Id: I1ca9135b4fa7d435e5a21534842c002509f1b7ff Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 05c1895924f4f739a55b2d9927f5c0d848d2c136) Reviewed-by: Qt Cherry-pick Bot <cherrypick_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 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-12-121-2/+2
| | | | | Change-Id: I302107459cfe6019b5bf3cbf71004eda0e3c108f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-12-111-2/+2
| | | | | Change-Id: I313eef38c91d6a930907bfe754374d20e60fe54d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Reuse qtbase's HTTP header parser to avoid a reinvented wheelØystein Heskestad2021-12-098-153/+108
| | | | | | Fixes: QTBUG-80700 Change-Id: I7b713fd869ac802d5eee8ebb8d90a2115365b509 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-12-091-2/+2
| | | | | Change-Id: Ib65f70fe0603a79d0d11d0038c1e16d4495ec570 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-12-061-2/+2
| | | | | Change-Id: If33f2c7c4640a7881c60176d5002e9b9d550f201 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-12-021-2/+2
| | | | | Change-Id: I7b9e51c15a6e8bfdfb8900b21929c69f5069664d 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. Pick-to: 6.2 Change-Id: I96f079c2f6c1d565f80da926ac901cd1b4734300 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-11-261-2/+2
| | | | | Change-Id: Ifdb0819fa6b5dc891e450197c645c85ba8202ce6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-11-101-2/+2
| | | | | Change-Id: I4807db711a5620072da9a7057eb10544e6761d90 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-11-041-2/+2
| | | | | Change-Id: I5d85a593296ccc6c1a858018c5bb880a9f132a31 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-11-031-2/+2
| | | | | Change-Id: If82979fce32b47c85b51b1f3820b01cfb7ba93ae Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-11-021-2/+2
| | | | | Change-Id: Ia4f0d0a536b531745b7ffb6c2c45ae0adb85ed05 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 Pick-to: 6.2 Fixes: QTBUG-97681 Change-Id: I434cfce2e0d7fb91534718becb953a1b94e16d16 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-10-201-2/+2
| | | | | Change-Id: I02e950d36e9342cb27a83fe217b8a7fa0e32b574 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-10-121-2/+2
| | | | | Change-Id: I53286fee6176e300b734733620241c27a60b509c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-10-111-2/+2
| | | | | Change-Id: I79f405724d832038ff48f42cf31ceb68b97ea41a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-10-081-2/+2
| | | | | Change-Id: I286c6e3fb0db169bbdba22cd8dc66be8ae540566 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Reuse header http parsing code from QtNetworkØystein Heskestad2021-10-083-180/+104
| | | | | | | Fixes: QTBUG-80701 Change-Id: Ic430a7dbc4448fc6d5fc000129a8e08bbed7e77d Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-10-061-2/+2
| | | | | Change-Id: Iba9c0d5348edcd86acadb8705e58e89200d3bd65 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Correct a recently introduced typo in an \externalpage linkLuca Di Sera2021-10-051-1/+1
| | | | | | | | | | | | | | | | | | Commit bfa705a7a20576405e77be28d185c84f96c1acd0 recently modified the link to the "Talking to Yourself for Fun and Profit" paper. While the new location for the `\externalpage` link is correct, it was erroneously introduced with a typo in it. In particular, `fd` was introduced in front of the `org` domain such that the link was incorrect. The typo is now removed such as to correct the link. Task-number: QTBUG-96127 Pick-to: 6.2 Change-Id: Ie4d169a978767b77f6d59b2ef135b3a3a8a0131d Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-10-051-2/+2
| | | | | Change-Id: Ib3ecaffd3010015065c0da122c4ad1804537eebf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Repair broken link to a websocket paperLuca Di Sera2021-10-041-1/+1
| | | | | | | | | | | | | | | The `\externalpage` link to the "Talking to Yourself for Fun and Profit" paper, presented at the Web 2.0 Security and Privacy 2011 conference, pointed to the version hosted on the `w2spconf` domain, which is not available anymore. To repair the broken link, it was changed to point to an equivalent version stored on the `ieee-security` site. Task-number: QTBUG-96127 Pick-to: 6.2 Change-Id: Id68c5947fa285062fa69a35fa9641e88118448ba Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-10-011-2/+2
| | | | | Change-Id: I4fd8e345516807802bd0b26701c21202872eec73 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-09-291-2/+2
| | | | | Change-Id: I9c889961b21312297284373681152f90662f43b8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-09-271-2/+2
| | | | | Change-Id: I663a72919499db69a29e34235bbb18b4c7773dad Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Migrate to autogenerated cpp exportsAlexey Edelev2021-09-272-13/+2
| | | | | | | | | Replace the hardcoded cpp exports with a generated one where it's applicable. Task-number: QTBUG-90492 Change-Id: Idc2d2d9f7ba2abbff462a27599b9a7b1aa704a4f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 07:52:52 +0000