aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.7' in qt/qtwebsockets6.7Qt Submodule Update Bot9 hours1-2/+2
| | | | | Change-Id: I9b76dd9d09472e944d26bc70b0c7b77d32ba353c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot7 days1-2/+2
| | | | | Change-Id: I37cabc37c6eeeae2070294a458de1db0f49dc992 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-05-071-2/+2
| | | | | Change-Id: I96b6a649bd7b4c9ff4ef734bc24eda93b6083585 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-05-061-2/+2
| | | | | Change-Id: Ia311564e9d10db8f0128d7b04a65104741fe4982 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-05-031-2/+2
| | | | | Change-Id: I37676f24787d3b8429244a992493b430e1d6ba79 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-05-021-2/+2
| | | | | Change-Id: I5f8c08bdae54f6a4d0f7a527e52cb258fc76abeb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-05-011-2/+2
| | | | | Change-Id: I4e606b0c2b72ef2d3941e1acd27bc7f7771ed4dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.7.2Jani Heikkinen2024-04-291-1/+1
| | | | | Change-Id: Ifc5c6dcb2a444445be46baaf79f8c2ec734a967b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-04-291-2/+2
| | | | | Change-Id: I72683ee5b770469c8f3c67878709aef0dbba8948 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android: explicitly bundle the OpenSSL libs for testsAssam Boudjelthia2024-04-243-1/+3
| | | | | | | | | | | | | | | Use the new argument to bundle the OpenSSL prebuilt libararies so that ssl operations are actually tested at runtime. Use close() instead of disconnectFromHost() for the server socket to fix Android failures for tst_qwebsocket::authenticationRequired(). Task-number: QTBUG-110025 Change-Id: Iad4734691acdd7c46556ff2f690ed068f9e139e1 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit e5b11413149c2a98aa135bb3eae0806e0e23befb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-04-241-2/+2
| | | | | Change-Id: I8b0fe6c3987164c5cea89abb2a9200222e72ec05 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-04-171-2/+2
| | | | | Change-Id: Ieb9bcf617835965605492c2633a70fb877345b48 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-04-151-2/+2
| | | | | Change-Id: I543ce2f19e84cb172857f820547fbc1a88913a5e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-04-091-2/+2
| | | | | Change-Id: I8d037d71994bf2936df5572ca0977a5347bc5ac8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add a licenseRule.json file for checking of SPDX license identifiersLucie Gérard2024-04-051-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The license test in qtqa reads this file in order to check the validity of the license used. This file reproduce the QUIP-18 [1] rules, with some exceptions. Each entry in the file corresponds to a set of licensing rules. A set of licensing rules can depend on the file ending, registered in "file_pattern_ending". The last entry in the file has no "file_pattern_ending", it sets the rules for the files whose licensing does not depend on their ending. The license to be used depends on the location of the file within the Qt module repository. Let's call this "<true_location>". The "<true_location>" can also correspond to a file name, offering flexibility for exceptions to the rule. The "<true_location>" are registered in "location". For each "<true_location>" there is a "file type" entry and a "spdx" entry. The "spdx" entry gives the rule: the expected license tag(s) in SPDX format for the file ending (if applicable) and "<true_location>". The "file type" informs on the QUIP-18 type the tested file corresponds to. It is purely informational for the reader. The set of rules are tested in order of appearance in the json file. For this reason, a more constraining ending (like "special.txt") needs to appear in a "file_pattern_ending" located before the "file_pattern_ending" of a less constraining ending (like ".txt"). Also, a file ending cannot be present in two "file_pattern_ending". "file_pattern_ending" and "spdx" should list strings. "<true_location>" can be regular expressions. During the test the deeper "<true_location>" are checked first. The order is which they appear in the json file does not matter. To test this file, run QT_MODULE_TO_TEST=../qtwebsockets perl tests/prebuild/license/tst_licenses.pl [1]: https://contribute.qt-project.org/quips/18 Task-number: QTBUG-121039 Change-Id: Id0c78cd8eb3511e3936601d883ec887f9e76e1d0 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 1c36bd533bef8d8da33cd1728e8b43e82ebbe11d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Correct license for documentation filesLucie Gérard2024-04-058-8/+8
| | | | | | | | | | | | | According to QUIP-18 [1], all documentation files should be LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only [1]: https://contribute.qt-project.org/quips/18 Task-number: QTBUG-121787 Change-Id: Iaafc796ab4ecfa98fd0cd8eca8c59a80dc7115ab Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 41144ba63b0f4dd935a026b3f0980b645421a205) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Change license for snippets and examples filesLucie Gérard2024-04-0511-11/+11
| | | | | | | | | | | | | According to QUIP-18 [1], all examples and snippets files should be LicenseRef-Qt-Commercial OR BSD-3-Clause [1]: https://contribute.qt-project.org/quips/18 Task-number: QTBUG-121787 Change-Id: I1218766366d536e7db9fed24f2481bab3bea4d7d Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 05c2968afb23fb585af062931843509832f8d51f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Change license for test filesLucie Gérard2024-04-0513-13/+13
| | | | | | | | | | | | | According to QUIP-18 [1], all test files should be LicenseRef-Qt-Commercial OR GPL-3.0-only [1]: https://contribute.qt-project.org/quips/18 Task-number: QTBUG-121787 Change-Id: Ifd31ca8a19acfd4584e1436db330a9aa7e405cfa Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 5a7354366d97aaa70d0972c762f94c28e115d272) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-04-041-2/+2
| | | | | Change-Id: I82e49bd3d9d3ae763aff60b4e8d54a7daaf020ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-04-031-2/+2
| | | | | Change-Id: Ife5bee8d7c0eafad1125e4028031ac602aa95524 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-03-281-2/+2
| | | | | Change-Id: I8e2bd405dc02251ede1148b1062cbaf572729d75 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-03-271-2/+2
| | | | | Change-Id: I84ad6c96eeda7fdf9bad95cf98380756530fdd35 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-03-211-2/+2
| | | | | Change-Id: I53d52e2bba4a876454aa871ecd7ddfafaab7aae5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-03-201-2/+2
| | | | | Change-Id: Id1af16f28b1655837de91e7e4d2e77c0eda947b0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Ssl example: renew certificateMårten Nordheim2024-03-193-43/+88
| | | | | | | | | | | | | | The files are larger now because the key size increased and the cert file has more information, like Org. Unit being set to WebSockets. Fixes: QTBUG-123346 Pick-to: 6.6 6.5 Change-Id: I46e235ffe596b9100e8a8da3bd350a6056ced1db Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 6502ef049120c23fa1efb19b3806b65157f5e378) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-03-171-2/+2
| | | | | Change-Id: Ic4669bcfd07d82996683085e57bec8ee10e8f058 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-03-151-2/+2
| | | | | Change-Id: I2d43ce6d6beb58448197ce3e2f96366aee62202b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.7.1Jani Heikkinen2024-03-151-1/+1
| | | | | Change-Id: I34bfb4e4c8d047afa2b125bb6904253d5d506f60 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-03-051-2/+2
| | | | | Change-Id: I469d77c48cdb7e9419003adf917a757b0e769a03 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-03-031-2/+2
| | | | | Change-Id: Ia4f3996ac1c9df1fe04b44b548ecd9a9e8ecf0e6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-03-011-2/+2
| | | | | Change-Id: I01a09367d70f238d734e5a0046b697a143baf42f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-03-011-2/+2
| | | | | Change-Id: I3b6535458faf62fb17683dd0e272098256425bd1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-02-271-2/+2
| | | | | Change-Id: I73e513655568aaa98e1cfbb532ae30925b72f13d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-02-231-2/+2
| | | | | Change-Id: Ib32393190b13014049bf4fd13008bb05f1be712f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-02-211-2/+2
| | | | | Change-Id: If44f345732f5f1c52986927391c2dcc23abc2b35 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-02-191-2/+2
| | | | | Change-Id: I956c06a4b3d9a397449ee7c23ac445a3829d0d55 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-02-151-2/+2
| | | | | Change-Id: Ia16318d6950c2cce99abf54f09523b568818bd67 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsv6.7.0-beta3Qt Submodule Update Bot2024-02-091-2/+2
| | | | | Change-Id: Id914ac629eae03de75e3b381394a596021732233 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-02-061-2/+2
| | | | | Change-Id: Id9833f6fe0ef0c8d55d4e58fccfd2df082dafc0b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-02-051-2/+2
| | | | | Change-Id: I4d724c6a1d38eb4188911336869d9a91abd62c51 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-02-011-2/+2
| | | | | Change-Id: I4e78d27b571e1b1c3dd1cae07d9b7518cbf632e1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsv6.7.0-beta2Qt Submodule Update Bot2024-01-231-2/+2
| | | | | Change-Id: I562ab8326b0738969273ded21f627830a5c44490 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-01-201-2/+2
| | | | | Change-Id: Ic3ab4315509ea937c3980ef65ac573a322dc728c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-01-191-2/+2
| | | | | Change-Id: Ied74051274b7d0b7e36e7093648eb08d7a0d9a01 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-01-181-2/+2
| | | | | Change-Id: Icf5b1b541befacea72c08abb33e36f31a2c531da Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-01-161-2/+2
| | | | | Change-Id: I8c3a4595296a37904027db3cbb5071d74917771d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-01-121-2/+2
| | | | | Change-Id: Ief6dac5d447c6be112a1c0e1cac0f209b76a9f2f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Cleanup echoclient cpp exampleCarl Schwan2024-01-093-4/+2
| | | | | | | | | | | - Remove m_url property. It is not used. - Remove constructing QUrl from QUrl as it is not required. Pick-to: 6.6 6.5 Change-Id: I07944b3b9e190d655be3fc37f2b8fd81018abc1b Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 99d0a787c636e80c02e9ef0384d5ba1a1963ac27) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2024-01-081-2/+2
| | | | | Change-Id: I1e99fc0a21f3217ad756a02be7ab52363c75ce93 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtwebsocketsQt Submodule Update Bot2023-12-221-2/+2
| | | | | Change-Id: I23b254c774489c3da64c89c2c58abd4fbe354d41 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 21:13:26 +0000