summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtwebsocketsHEADdevQt Submodule Update Bot2023-05-171-2/+2
| | | | | Change-Id: I27fc275d822a336874dce406826fb823eb609632 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-05-111-2/+2
| | | | | Change-Id: I5d3da4a451d2fbaa0e98f08fc91717a59ae524c3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-05-101-2/+2
| | | | | Change-Id: I9b2ff64e05718d32518fc5449987fffb84c766fe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add the use of the qt_internal_project_setup functionAlexey Edelev2023-05-031-0/+1
| | | | | | | | | The function sets the required CMake variables and policies. Pick-to: 6.5 Task-number: QTBUG-112685 Change-Id: I0f7b49bfd8a5b1c714c839c3cff2d7e2110f6d73 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-05-021-2/+2
| | | | | Change-Id: Id5c8ebb65548195e3c0e5e06561f5bae34c5f94c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-04-271-2/+2
| | | | | Change-Id: I22edb440f056be8a242339797ea559db37e87a03 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-04-241-2/+2
| | | | | Change-Id: If5ed5aff5f35d63eee21338e8d68ee84ce52af30 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-04-201-2/+2
| | | | | Change-Id: Ib428cdd87c64e7d8ee21917387f47ebe6b4c549b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-04-191-1/+1
| | | | | Change-Id: Iae03704e692a4d1dd0afc4bba9cff74f93d6e718 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-04-181-2/+2
| | | | | Change-Id: I65403c6096f5ce41d4f321e3c35ffcd9bb7923a9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-04-131-2/+2
| | | | | Change-Id: Ieb97c3d40c33a38e6793a93fbb284106ff60af45 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-04-121-2/+2
| | | | | Change-Id: I619bf94e4125600650d64f61f11a957f841b10cb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Use the \examplecategory macro to tag examplesTopi Reinio2023-04-128-8/+8
| | | | | | | | | | | | | | | | The '\meta category' command was used for tagging examples with a specific category, used in Qt Creators Welcome mode. As we want to also generate lists of examples belonging to a category elsewhere in the documentation, replace the command with a macro that expands to the original \meta command and also adds the example to a group using the \ingroup command. This way, the category names can be used as arguments to the \generatelist or \annotatedlist commands. Pick-to: 6.5 Task-number: QTBUG-112731 Change-Id: Ia1b34175e10109eef055b2759705f0ca0521179a Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-04-111-2/+2
| | | | | Change-Id: I31369b908a6e7103fbdfb57e11da563979e73273 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-04-051-2/+2
| | | | | Change-Id: I4472210604e30652c9743df4d1a83fdca8c03831 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-04-041-2/+2
| | | | | Change-Id: Ie33e6ba193dcde9167a0364b9de0da07fbe7e27b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-03-281-2/+2
| | | | | Change-Id: Ic93a1b0fc326d9e99266ac2e6dcf0055d3926faf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Address issues with test introduced with 401 supportMårten Nordheim2023-03-281-11/+15
| | | | | | | | | | | | | | The testing with Connection: Close wasn't necessarily testing it since it was relying on not having a Content-Length, but this did not work out as intended. And fix excluded code (#if 0), relies on an update in qtbase. On macOS the ST backend was having trouble with how we handled shutdown of socket and re-use. Amends da30f70fea239f723f1d36b076bb3f5860f50ed9 Change-Id: I8a19387b911eec522690d597d863c5bc0786e8c8 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Make endpoint configurable for echoclient and sslechoclient examplesØystein Heskestad2023-03-245-19/+67
| | | | | | | | | Add handling of command line arguments for hostname and port. Task-number: QTBUG-110894 Pick-to: 6.5 Change-Id: I22d8f9e112cfb6c02b3e741c14720a0f28565984 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-03-201-2/+2
| | | | | Change-Id: I59b7809ddf790adf0292d3e724629c87083003cc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Expand documentation of examplesØystein Heskestad2023-03-1514-34/+124
| | | | | | | | | | | | | Add to the documentation to include what the examples do and how they do it, to make it easier for users to decide if an example is worth looking into, instead of how it was where they had to look at the code in the examples to decide if they are relevant for their purposes. Also added pictures to the examples. Task-number: QTBUG-110894 Pick-to: 6.5 Change-Id: I2751939e9f9716cd970e5fa938dabf042f369329 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Add Axivion configMatti Paaso2023-03-151-0/+60
| | | | | | Task-number: QTQAINFRA-5244 Change-Id: Ib91648f1a03b73baa8b871ea2eb9d3dcc9e8e517 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* sslechoclient example: Verify server certificateIevgenii Meshcheriakov2023-03-143-7/+23
| | | | | | | | | | Exit the application in case of any SSL errors instead of ignoring them. Fixes: QTBUG-108654 Pick-to: 6.5 Change-Id: Id209930c29fd434e2ede7a4d38452296e8cfb6f2 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-03-111-2/+2
| | | | | Change-Id: I9c523796964e3273701896576a9f831129aeb70d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* wasm: fix unconnectedState signal being emitted when closedLorn Potter2023-03-071-0/+2
| | | | | | | | Pick-to: 6.5 Change-Id: I266f3c194d22898da7af263191abf77250953a55 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io> Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-03-021-2/+2
| | | | | Change-Id: I62a328503ebd6d262e81ab1cc0434b0176d85249 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-02-241-2/+2
| | | | | Change-Id: Ie8ccb5cd0820d0a03543e09e8ad90d11ea970b64 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* wasm: make sure connection is closed before being deletedLorn Potter2023-02-222-2/+8
| | | | | | | Pick-to: 6.5 Fixes: QTBUG-111248 Change-Id: I94a033fedf546c4d7f36af6c82a166dc33800f1f Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-02-211-2/+2
| | | | | Change-Id: Id4092fa5e927021d8160487341612c22ba81ac8b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-02-131-2/+2
| | | | | Change-Id: I4896ab11fdf60d57c8eef4cfae18f619fd9acf6e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix QML WebSocket Client ExampleØystein Heskestad2023-02-101-5/+5
| | | | | | | | | | | | The client was connecting to echo.websocket.org which is permanently down. Connect to ws.ifelse.io instead. Also fix signal handlers to use JavaScript functions with formal arguments, because signal handlers should no longer rely on injection of parameters. Task-number: QTBUG-110894 Pick-to: 6.5 Change-Id: I6d8999424ab41d153a6c0adbb04d7fac30a213da Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix QML WebSocket Server ExampleØystein Heskestad2023-02-101-2/+12
| | | | | | | | | | | | Client websocket did not connect to websocket server before, but now connects to server after server has started. Also fix signal handlers to use JavaScript functions with formal arguments, because signal handlers should no longer rely on injection of parameters. Task-number: QTBUG-110894 Pick-to: 6.5 Change-Id: I02242e26bad85fe94c0d3b1ea4b9dd4b2c0cbcfd Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* wasm: return amount of bytes sentLorn Potter2023-02-101-1/+6
| | | | | | | | | | | Since we do not know how many bytes were sent until the asynchronous send callback has been called, we just assume all bytes have been send if the call returns successful. Fixes: QTBUG-110951 Pick-to: 6.4 6.5 Change-Id: I1c21d23e278b0e48ac0c73e4ea5a7dccfbd5e198 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* wasm: make exception for localhost,127.0.0.1 and ::1Lorn Potter2023-02-091-5/+17
| | | | | | | | | Localhost is a special case for secure context and is considered secure, so we can open this up for mixed ws:// on https:// Pick-to: 6.4 6.5 Change-Id: I150ce6447b57b70040039a4da2a3966025e3bb33 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-02-011-2/+2
| | | | | Change-Id: I88a09e1e70da2dd1fdde7dca9b6af43a0670227f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix CMake Unity (Jumbo) buildsFriedemann Kleint2023-02-013-10/+9
| | | | | | | | | Move clashing constants to QWebSocketPrivate. Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: I6d22f2134683c2fb65b79732b991c7ff05338a8c Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-02-011-2/+2
| | | | | Change-Id: Ia663b7c6b692d02f9f84e6d715a694073e33d386 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* wasm: fix depreciated error APILorn Potter2023-01-231-2/+2
| | | | | | Pick-to: 6.5 Change-Id: Ic9ac052b5b6b142f5ae19d76fc26596b085fb804 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-01-201-2/+2
| | | | | Change-Id: Idb18e9dd393d0bee2938dbb39dd9f8b9cdad2e95 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Blacklist two tests in handshakerequest"Edward Welbourne2023-01-201-5/+0
| | | | | | | | | | | | This reverts commit 9486a8053edd0eab68a03178effebda0d5194607. The bug that caused this has now been fixed, so presumably these tests should now be OK again. Change-Id: Ifed83aedccc32cdd68600f94c1b3c5b8d5c7c8b9 Pick-to: 6.2 6.4 6.5 Task-number: QTBUG-84315 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-01-171-2/+2
| | | | | Change-Id: Ib9bd3dab2b70bc609182535a7f1741dee9a792f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add the missing QWebSocketProtocol header fileAlexey Edelev2023-01-161-0/+4
| | | | | | | | | | Namespaces don't generate the symbol-based CaMeL header files. Force syncqt.cpp to generate the header file using qt_class pragma. Pick-to: 6.5 Fixes: QTBUG-110150 Change-Id: Ib9825226d10eeec55bd491eaef9dadeefef3da01 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-01-121-2/+2
| | | | | Change-Id: Id2c520471e456f2c7ad31d0f1dd2006737c71f4c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-01-091-2/+2
| | | | | Change-Id: I5d6c8320ae211043e8a1aa32c32438dd5e0fe9c2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-01-041-2/+2
| | | | | Change-Id: I044959ceaac3ecfd691b185a1ad73f5ceecfbd45 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-01-031-2/+2
| | | | | Change-Id: I67a2a33028b830a6dfd048598e5e33c3806b1996 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove QT_USE_SYNCQT_CPPAlexey Edelev2023-01-021-2/+0
| | | | | | | | Option has not effect anymore. Pick-to: 6.5 Change-Id: I244a5408307a3e94ff76a3ffd1eea3e3c6f67241 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* wasm: fix heap-use-after-free when using deleteLaterLorn Potter2022-12-282-4/+7
| | | | | | | | | | | | QWebSocketPrivate was getting destroyed before the emscripten close callback was getting called, which was then calling back into the already destroyed object. So we set the UnconnectedState before it gets destroyed. Fixes: QTBUG-108996 Pick-to: 6.5 6.4 Change-Id: I8ebbe5a55188a31209a95d2a71eea2faee3465ad Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Pass number of items to a call to tr()Mårten Nordheim2022-12-211-3/+4
| | | | | Change-Id: I26214261662e466777b7438be13d91a0557f5e3c Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* tst_QWebSocket: style fix; drop unnecessary spaceMårten Nordheim2022-12-211-1/+1
| | | | | Change-Id: I0b4e65bb97e358aad85f41761d3bd2c64b313e62 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
View Lorry Controller Status