aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.3.1' in qt/qtwebsocketsv6.3.1Qt Submodule Update Bot2022-06-081-1/+1
| | | | | Change-Id: Ib2d814dd2e7648af52941dec4d3e780cfbad1145 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3.1' in qt/qtwebsocketsQt Submodule Update Bot2022-06-061-2/+2
| | | | | Change-Id: I64d2da725a367b1470fcdfdbbc16fccce493f7d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3.1' in qt/qtwebsocketsQt Submodule Update Bot2022-06-031-2/+2
| | | | | Change-Id: Icc561397ee4e023fcead9e41f74026c147843621 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-05-311-2/+2
| | | | | Change-Id: I023e737c5c481bfabb907c417fa816256bd5ab07 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-05-271-2/+2
| | | | | Change-Id: I1dcfce5e43e1991cafa7ab161453d0dad49708af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Empty pre-release version in '6.3' seriesJani Heikkinen2022-05-251-1/+1
| | | | | Change-Id: If0f77833d2db4b1654ece5c2b381d761c45c543a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-05-251-2/+2
| | | | | Change-Id: Ia5618b1a6ee53895ab115efa49077a192f3db91f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-05-191-2/+2
| | | | | Change-Id: I1eefe6b1c1c36a3293bc86ba6db1a82ad58a28c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android: package qml test dataAssam Boudjelthia2022-05-181-0/+5
| | | | | | | | | Task-number: QTBUG-88846 Change-Id: I7505f68e99d173edd93770b2b37c77ecc2b128e7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit a398b65eda5c6da263c440a460220ad47aec1a82) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-05-121-2/+2
| | | | | Change-Id: Ic2b1a35821ea48eb726f201c6a7655eec8706ab0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-05-091-2/+2
| | | | | Change-Id: Ia1ee290877c6775cc793a184ed06293472268e63 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-271-2/+2
| | | | | Change-Id: I8f6667ba40b5957096ab229f8f0a37462a2e4019 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-221-1/+1
| | | | | Change-Id: I73b2e828b7159622dfb538632e7b4d4f8df25c70 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android: ignore some tst_qwebsockerserver unit testsAssam Boudjelthia2022-04-211-0/+5
| | | | | | | | | | | | | | | Ignore those tests to allow enalbing CI tests and fix them one by one after that. These couple cases fail mainly because they don't have the openssl libs bundled with the apk, that is expected to be handled under QTBUG-89053. Task-number: QTBUG-102713 Change-Id: I5cb3d9f62f6943d1477c99456cd650b69ab8c86d Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit ab7dd2ac029da966bcd0095b97168fb364d73006) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-201-2/+2
| | | | | Change-Id: Id783c1e665b9139e8cf36b33247588139e34be42 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-191-2/+2
| | | | | Change-Id: If7a404fd5852ce10d1e18fa27882c03e8edd9bff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-181-2/+2
| | | | | Change-Id: I7e29dfb63055c332101170693f1ec7460ea7be7c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-141-2/+2
| | | | | Change-Id: I208c971093fa566d088385c9d71f1980aa1fe951 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-081-2/+2
| | | | | Change-Id: I96cffc5ce2e59289820fd6f3bb2a604cdefafd8a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-061-2/+2
| | | | | Change-Id: I9f355cb1d3491f87dedc65661791d13b2d8cbb33 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-011-2/+2
| | | | | Change-Id: I47c1fb740bda27aef4e2abb1e30d220489e50286 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix handshake looping infinitely making no progressMårten Nordheim2022-04-012-6/+65
| | | | | | | | | | | | | | | | | | | | The processHandshake function may make no progress and return. The loop calling processHandshake previously had no way of knowing this and would happily loop forever despite the outcome being the same every time. This was particularly noticeable with any response that doesn't include the \r\n\r\n sequence the first time we call processHandshake. Since processHandshake either fails or succeeds, not performing any partial-reads, we simply move it out of the loop and restructure some of the code around it. Fixes: QTBUG-102111 Change-Id: I3955e4b90eb1be0a0ef5dfcf8a46921a086a8b49 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 631fb7665fb53521df2cedb186a8e1e370b2aaa4) Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Revert "Blacklist: test cases blacklisted in tst_QWebSocketServer:"Pasi Petäjäjärvi2022-04-011-4/+0
| | | | | | | | | | This reverts commit 3b012563ac4e0597cba0e6f92edc0e0fc376d2e5. Reason for revert: Should not have been merged Task-number: QTBUG-101333 Change-Id: I972eab01b658a04b9ff456024c3f472674c86e33 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>
* Bump version to 6.3.1Jani Heikkinen2022-03-301-1/+1
| | | | | Change-Id: Iffdf186cc8e44905ed0ae50b8f46268ba1ecc7f7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-03-301-2/+2
| | | | | Change-Id: I3c522fb8970871e4a0598dd43c7fe11dcfceabf1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Revise Qt WebSockets module landing pageAndreas Eliasson2022-03-281-33/+33
| | | | | | | | | | | Remove the include directive section and add the global CMake and qmake snippets. Also, reorganize some of the sections structure. Task-number: QTBUG-100369 Change-Id: Ief7a5f845df5b2edaa17c3c652895a4adb7ad3a5 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit acc165cc4ef68832e250c10807d7966f9032af0c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove .prev_CMakeLists.txtKai Köhne2022-03-224-59/+0
| | | | | | | Change-Id: Icaf0fac81f51432c706a948d0986aae68e44fffb Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 7bd0a9f0c6c2d7791a89e304442970b08d8a295a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-03-211-2/+2
| | | | | Change-Id: I8aca20bb109ad0bc457b3f7b20042c0619b4d920 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-03-161-2/+2
| | | | | Change-Id: I1fece9ace11b5780fe4c6373c6d26c086550e95c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-03-141-2/+2
| | | | | Change-Id: I846f23b8bf6765b735f2a4d9218596258b3e6271 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsv6.3.0-beta3Qt Submodule Update Bot2022-03-111-2/+2
| | | | | Change-Id: Ie1d843eb7ad1d7b19c34b3d276a01c316c350f97 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-03-081-2/+2
| | | | | Change-Id: I67657828f633837cfe7f5338267ba78b420c6291 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 06:50:09 +0000