aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Android: explicitly bundle the OpenSSL libs for testsHEADdevAssam Boudjelthia23 hours3-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 Pick-to: 6.7 Change-Id: Iad4734691acdd7c46556ff2f690ed068f9e139e1 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot6 days1-2/+2
| | | | | Change-Id: Ic1ce896ba20d76c957d74c7408ffd93590dbfaa1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot8 days1-2/+2
| | | | | Change-Id: Ie47d07263f128509912e06e7ca2ee0b1192a4638 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 Pick-to: 6.7 Task-number: QTBUG-121039 Change-Id: Id0c78cd8eb3511e3936601d883ec887f9e76e1d0 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* 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 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: Iaafc796ab4ecfa98fd0cd8eca8c59a80dc7115ab Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* 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 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I1218766366d536e7db9fed24f2481bab3bea4d7d Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* 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 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: Ifd31ca8a19acfd4584e1436db330a9aa7e405cfa Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-04-051-2/+2
| | | | | Change-Id: I37ee00253c36c7612f46b726d5ae6d08f3316828 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-03-251-2/+2
| | | | | Change-Id: Iaee9cb184d23bcc48d5957bbfbc662bee333b713 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use NO_GENERATE_CPP_EXPORTS explicitlyAlexey Edelev2024-03-251-0/+1
| | | | | | | | | | Use NO_GENERATE_CPP_EXPORTS explicitly for modules that don't need the autogenerated exports header file. Task-number: QTBUG-90492 Change-Id: I399a51ed1c07944e8c3cd9a06c10e9cdcfa9f310 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* 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.7 6.6 6.5 Change-Id: I46e235ffe596b9100e8a8da3bd350a6056ced1db Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-03-171-2/+2
| | | | | Change-Id: I3cfbbbec157cc24e1e48d4e14a0824a7cc1e80b3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-03-161-2/+2
| | | | | Change-Id: I31b6eaeabac06ad2f91ad0878cca59723cf93283 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-03-141-2/+2
| | | | | Change-Id: Icdcab2b5c2197ad8dbeadf7fc7516f9c7af61f60 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-03-101-2/+2
| | | | | Change-Id: I36deb89dd38a0b461225f6ac62fad5f365deb16b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-03-021-2/+2
| | | | | Change-Id: If525d5c3597022368545eda2cfe0e220ea119908 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-02-271-2/+2
| | | | | Change-Id: I267b0c691f370196e459e822dba04b51ab2ceb41 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-02-231-2/+2
| | | | | Change-Id: I714ce8456f199bb1aed4bd79b8946702d7d0e910 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-02-191-2/+2
| | | | | Change-Id: I5471c5ed644858d988edc96da8084d0d5db18597 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-02-111-2/+2
| | | | | Change-Id: If0fc10a538b3842496573ec95d8a2670aab4c8ee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use QHttpHeaders in QWebSocketHandshakeRequestLena Biliaieva2024-02-073-5/+6
| | | | | | | | QWebSocketHandshakeRequest::headers() method is changed to return QHttpHeaders. Task-number: QTBUG-120133 Change-Id: I4160512161840a675057daf34534a34cda19bc4d Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-02-071-2/+2
| | | | | Change-Id: I64823d21c07590259082b6fda1059b9f1f30335b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-01-271-1/+1
| | | | | Change-Id: I4327827bd7cd9d11191f01d2bf1b05cff49584ce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-01-251-1/+1
| | | | | Change-Id: I86178f56221478ca6e759128b48f347f2de35e3c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-01-221-2/+2
| | | | | Change-Id: I049f0f11963674b0bca4e4ec40cad10a1045ea9b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-01-201-2/+2
| | | | | Change-Id: I50f388d3b189469b7da544e5b41a9bbcb7aeb0f0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-01-191-2/+2
| | | | | Change-Id: Id49c41440edae4af9244f8e7a00f7295fa82a945 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-01-181-2/+2
| | | | | Change-Id: Ia3015f9490f8888187e64f815a0a3e890de1200f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-01-151-2/+2
| | | | | Change-Id: I17758c1daace8d64940c660e54cfe496ac1768b6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-01-121-2/+2
| | | | | Change-Id: If05ea512aabe769bc2478a0d02040dceb76d39d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-01-101-2/+2
| | | | | Change-Id: I68ea096a6358a717c5a15e190b750f879d87d57f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Cleanup echoclient cpp exampleCarl Schwan2024-01-083-4/+2
| | | | | | | | | - Remove m_url property. It is not used. - Remove constructing QUrl from QUrl as it is not required. Pick-to: 6.7 6.6 6.5 Change-Id: I07944b3b9e190d655be3fc37f2b8fd81018abc1b Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2024-01-051-2/+2
| | | | | Change-Id: I9a0ac940298f168bcf7edbc0662b25a2c1bfae12 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-12-281-2/+2
| | | | | Change-Id: Iccb990a0e7f5c5f458b39c80ec5b6de6221e4685 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-12-211-1/+1
| | | | | Change-Id: Iec3dc28d7effb923efed1e459d244ca509ac6cd1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-12-191-2/+2
| | | | | Change-Id: I7b2b4c9070caa9aeb529519757771eb361b18588 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-12-181-2/+2
| | | | | Change-Id: Ib83e24d3d8d55217591980b709a6314d29aee1ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-12-151-2/+2
| | | | | Change-Id: I95f2a1446f5f178b4a53db0663e97f183ef22467 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-12-131-2/+2
| | | | | Change-Id: I19a1d1a601814f3cee82283dd9d16e70d9c0acc5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.8.0Jani Heikkinen2023-12-131-1/+1
| | | | | Change-Id: I4c8184f721524633bc991ca93ac048c1b53f7782 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Don't use versioned importsKai Köhne2023-12-113-7/+7
| | | | | | | | In Qt 6, the canonical import is without a version number. Pick-to: 6.6 6.7 Change-Id: I64e194392f1fa1912c16650f40c40a6c6257de77 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-12-101-2/+2
| | | | | Change-Id: Ie92e7bbec7e4e5302137db25c1dcfd6b1fca0fbb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-12-091-2/+2
| | | | | Change-Id: If06c5a1f9e445502b1487c3a178ca0c3c5227313 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-12-081-2/+2
| | | | | Change-Id: I0131aeec3310a2b057298d914b247af779b1500b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-12-051-2/+2
| | | | | Change-Id: Ia3e3c22b9ad6b908c87cd79a572e353df9a62fbc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-12-041-2/+2
| | | | | Change-Id: Id688817bb70895ca20c43f40dd989845ad70949d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-12-011-2/+2
| | | | | Change-Id: Ib1c8bb8c17a992cdf448016cf8af6f72aace34a3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-11-301-2/+2
| | | | | Change-Id: I906bd5110662ae762068b0d0bf94e780e5d8fe12 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-11-291-2/+2
| | | | | Change-Id: I9b03e8c8ead340f2f807dd2e001abaa3286f7a06 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-11-271-2/+2
| | | | | Change-Id: Ia13a438517cbbaa6c6fecd204ca36c1383d4e8e9 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-04-25 07:20:52 +0000