summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.5.1' in qt/qtwebsockets6.5.1Qt Submodule Update Bot2023-05-161-2/+2
| | | | | Change-Id: I7ae23c450bd910074efe0a11501f230bd4535872 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.1' in qt/qtwebsocketsQt Submodule Update Bot2023-05-141-2/+2
| | | | | Change-Id: I620dcbf44ce2d018378f3c34008ceec0bd916bdf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.1' in qt/qtwebsocketsQt Submodule Update Bot2023-05-111-2/+2
| | | | | Change-Id: Ic62a0748255636dfcd0efca10c0a64e6b577c859 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.1' in qt/qtwebsocketsQt Submodule Update Bot2023-05-051-2/+2
| | | | | Change-Id: I73c4a00c636b46b71efdf6d4b01493b176e622e4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-05-011-2/+2
| | | | | Change-Id: I26774df85fd9353124ca0f6b51fa6b4f0d83923d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-04-281-2/+2
| | | | | Change-Id: I0b8ff7dc0338eae899197b02896e734cbae823dc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-04-261-2/+2
| | | | | Change-Id: I2bc2422eacd1b39884c98ff387eb298a89041ab6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-04-201-2/+2
| | | | | Change-Id: I7d14d0edae5f0c05bb860c41836454f23c997c64 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-04-191-2/+2
| | | | | Change-Id: I9645efebf6f4d334ab18496a54a74e95b3e9df3f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-04-171-2/+2
| | | | | Change-Id: Ie18dee46e002bf8441b804f3734c16ed3e115d40 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-04-131-2/+2
| | | | | Change-Id: I28c3714e0594978b93e60e11c6ddef31b0b85d61 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-04-121-2/+2
| | | | | Change-Id: I6778b26590465e018a4d97a71bcc5f94a14f2cbd 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. Task-number: QTBUG-112731 Change-Id: Ia1b34175e10109eef055b2759705f0ca0521179a Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit a5f6f3f710fc9de3f8b9d4685e22c9c8912b11d9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump version to 6.5.1Jani Heikkinen2023-04-041-1/+1
| | | | | Change-Id: Iddde4dd8df1e4926894db1a848ff1eb813bf61b6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-04-031-2/+2
| | | | | Change-Id: Ib11de042069e88b10edab12f0e9c34846247263e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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 Change-Id: I22d8f9e112cfb6c02b3e741c14720a0f28565984 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 99fdf11b808ab9b38239b04399a3fff21fa6ed35) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-03-241-2/+2
| | | | | Change-Id: Ia3e57ab0436c76bc1dc83520abacc01edaed6f3f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-03-221-2/+2
| | | | | Change-Id: I651912eee202236d1bb158a66b4b4a2b024136f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-03-161-2/+2
| | | | | Change-Id: I89006ce915c33c1e87b40ef75eeeab49e965f6bd 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 Change-Id: I2751939e9f9716cd970e5fa938dabf042f369329 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 0b665063815a429d7862e261dfa469ca50c55fa4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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 Change-Id: Id209930c29fd434e2ede7a4d38452296e8cfb6f2 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io> (cherry picked from commit 6821b4426e74e3063936c5622b5eb2e249c40502) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-03-111-2/+2
| | | | | Change-Id: Ie564aaf92cc4a6507639d44bb3830a7f3b114f5b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-03-081-2/+2
| | | | | Change-Id: I778465701a069665ed1050334770e714f1de9cb8 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
| | | | | | | | | 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> (cherry picked from commit 3fe09c65a916dba76f0a84077f35a9befe97dab2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-03-031-2/+2
| | | | | Change-Id: Iac196a69a64026c671e73c2b1ba81e9d35b85d8c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-03-021-2/+2
| | | | | Change-Id: I90a9831fe219a2eddc8068e7aa1dfb08a79e9084 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-03-011-2/+2
| | | | | Change-Id: I77a88845d7fe17c6ebb789226ff10655de4d0da0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-02-231-2/+2
| | | | | Change-Id: I897e3dd6181c6920422a58c86b8ccab8447c0956 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* wasm: make sure connection is closed before being deletedLorn Potter2023-02-212-2/+8
| | | | | | | | Fixes: QTBUG-111248 Change-Id: I94a033fedf546c4d7f36af6c82a166dc33800f1f Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit b14a7efd629895a03cdbfa433905509b5f014906) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsv6.5.0-beta3Qt Submodule Update Bot2023-02-171-2/+2
| | | | | Change-Id: I759f04f5d6d7bb2446549bbfe6db2b129fcd45e2 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 Change-Id: I6d8999424ab41d153a6c0adbb04d7fac30a213da Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit b6de54adde05c0361c13a4c862f254017d002ba6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-02-101-2/+2
| | | | | Change-Id: I80f6231edf3813a90062098d9c25e35edc2ce905 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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 Change-Id: I02242e26bad85fe94c0d3b1ea4b9dd4b2c0cbcfd Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit ef185021bcda2b7ff15e0b555fb2a48b86d867d4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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 Change-Id: I1c21d23e278b0e48ac0c73e4ea5a7dccfbd5e198 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit a43383a74d4928ed4be6afe657af2781baaf6e7a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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:// Change-Id: I150ce6447b57b70040039a4da2a3966025e3bb33 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit edbea44a9af0c16833ede6a38d79390cdc6f8958) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-02-021-2/+2
| | | | | Change-Id: I7d9a076a62dcae174a16f3f79c908b2c8034869a 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. Task-number: QTBUG-109394 Change-Id: I6d22f2134683c2fb65b79732b991c7ff05338a8c Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit af5712d929295bc88ddc2c85754da59dbab9a8eb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-01-311-2/+2
| | | | | Change-Id: Icddb8a8e932fba1b5f3d1a5e4271ac637ce30ed1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-01-271-2/+2
| | | | | Change-Id: I4befbedc33d25871018176b149a650faaa86dae8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Blacklist two tests in handshakerequest"Edward Welbourne2023-01-271-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 Task-number: QTBUG-84315 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 92fa05e8721dc29984a544686c646a77b9531c95) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* wasm: fix depreciated error APILorn Potter2023-01-231-2/+2
| | | | | | | Change-Id: Ic9ac052b5b6b142f5ae19d76fc26596b085fb804 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 2f13d30d6d68ca059af39b5c6969f97f0d92ca9e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsv6.5.0-beta2Qt Submodule Update Bot2023-01-231-2/+2
| | | | | Change-Id: I3f3ff7f0be4b482a4b4aa79543931f5fd61a93b9 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. Fixes: QTBUG-110150 Change-Id: Ib9825226d10eeec55bd491eaef9dadeefef3da01 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit ca36bfe3fdab36c754b53e9468d638bbed4a76a5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-01-131-2/+2
| | | | | Change-Id: Id5bc373af45e96dbe4174d6cdef4391b148850d5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-01-091-2/+2
| | | | | Change-Id: I750e8dbacf16c61a781b2451128ce2e8ee9a112f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-01-041-2/+2
| | | | | Change-Id: I89a0d212930a29e15b15d1084a0b9b2a4009d362 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. Change-Id: I244a5408307a3e94ff76a3ffd1eea3e3c6f67241 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit a8a86a5714a8749e11460a0e437ad2055c271326) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2023-01-021-2/+2
| | | | | Change-Id: I7d38cad19f0f7e128ffefba04e1922c864ebdfaa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2022-12-301-2/+2
| | | | | Change-Id: I9c5fcaf0052298943ff4f54c864c0b156d4d3b40 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtwebsocketsQt Submodule Update Bot2022-12-291-2/+2
| | | | | Change-Id: I9687ca9ee43aee12bee64201fc65bd3435a9e9a7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>