aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-08-281-2/+2
| | | | | Change-Id: I9482c6af9aa136f6bf0e7d18a7261ce388e7f714 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-08-251-2/+2
| | | | | Change-Id: Icc66a76a47350d1409d3d5dc5249fe43c0ac09a1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-08-241-2/+2
| | | | | Change-Id: Ica1b04bb67715f21771e7d91b76efe55761c81c1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Split error message about unsupported WWW-Authenticate challengesFriedemann Kleint2023-08-221-5/+12
| | | | | | | | | | | | | Passing the count is wrong unless %n is actually used. Amends da30f70fea239f723f1d36b076bb3f5860f50ed9. Task-number: QTBUG-92858 Change-Id: I3aed91dde4b8e9321b9408d02d50eb31a93439ba Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit edd1df7dc6f5fa776b9b8be2003e0210821ceee0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-08-221-2/+2
| | | | | Change-Id: I5a68497ed3d73cb336c22d1081ce2a94fe67f63e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Exclude some examples from build for AndroidElias Hautala2023-08-216-6/+28
| | | | | | | | | | | | Exclude echoclient, echoserver, simplechat, sslechoserver and sslechoclient examples from build for Android because those examples can't be built for Android. Task-number: QTBUG-111933 Change-Id: I88c58b7d3530bf81aba66c97b85cd677108d1f00 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit 885888b79fb3047eb7b89d557a4e4bb7a5315ff2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsv6.6.0-beta3Qt Submodule Update Bot2023-08-161-2/+2
| | | | | Change-Id: I9472fb638073004a73757f79853cf4a32a3d5c76 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-08-151-1/+1
| | | | | Change-Id: I590f14ce05f45f6d48baf26d12b8a2396efc9d71 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-08-151-2/+2
| | | | | Change-Id: I00dc5252d0ea6a32bc5def9035374836f5ffcff6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QWebSocket: include and fwd-declare what you needMarc Mutz2023-08-141-0/+3
| | | | | | | | | | | | | | | QWebSocket is-a QObject, so explicitly include qobject.h. The header also needs QAuthenticator in-name-only, so forward-declare. Don't rely on other headers to do it for us. Found in API-review. Change-Id: I4214a623cb52f1d90045f7c209e46d3b12f837e3 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 28e973d2246c9af67348b9b4c1287b017e27ead6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-08-081-2/+2
| | | | | Change-Id: Id31c92c7309d6b697dbc13cfa5fba2abf6cdb427 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-08-021-2/+2
| | | | | Change-Id: I281975aabac466e61d8977c7dff6d010aa19af1e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-07-311-2/+2
| | | | | Change-Id: I0c3d998a86784c5f359b3bb9ef1e966d409b857f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-07-261-2/+2
| | | | | Change-Id: I0fa8aa43992b5552d380470c593194226409009c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: List of all Qt overviews which are now termed as explanationJaishree Vyas2023-07-241-0/+1
| | | | | | | | | | | | | The autogenerated list of overviews was adding the \group command which included all the groups instead of overviews. The idea here is to categorize the overviews later on once we have the list of all overviews. Task-number: QTBUG-114762 Change-Id: I1ad1a2d3ba0d1ff6a7e2c9a702f7f420fadafa92 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit ba66f9ea7c3c53c7b13617892a7cdc3dc4505db3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-07-211-2/+2
| | | | | Change-Id: I3dea41252be0f7476e2b7242f396c663c175e76a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-07-121-2/+2
| | | | | Change-Id: I89450687da19e382117ca0bdcdb2d1059777829d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* tst_QWebSocketServer: move qsslpskauthenticator uses into ssl-guardMårten Nordheim2023-07-101-1/+7
| | | | | | | | | | | It previously was conditioned on 'openssl', but since the TLS backends turned into plugins it is not useful to check for this #define anymore. The ifdef was removed, but still requires the 'ssl' feature. Change-Id: I6ea59baff5040a2825f8630b51efab2476990b95 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 95faeb4d75ee295f03f5d4739ecbfef5cbaaa8de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsv6.6.0-beta2Qt Submodule Update Bot2023-07-071-2/+2
| | | | | Change-Id: Ifcb33f7191f26e7904a43e61dd193a764288a725 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-07-031-2/+2
| | | | | Change-Id: Iabcdfc7a12f006638e018a8f65da23ddd0227990 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-06-211-2/+2
| | | | | Change-Id: I94fac998c0905c1b24229e7f75fd0bffd6f7831a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-06-201-2/+2
| | | | | Change-Id: I26b9858a07930967fb2b3d255dc052a7459b440b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-06-151-2/+2
| | | | | Change-Id: I2bca66aa4976db1ed1e8593422a0dc74e8fc6f98 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix error message not to use exclamation marksFriedemann Kleint2023-06-131-1/+1
| | | | | | | Change-Id: I74b77450893a68d77f4ec677b6c0481cbc96e44a Reviewed-by: Christian Stenger <christian.stenger@qt.io> (cherry picked from commit 0053906d2fecd2eb4bb0c0a3d682e6b7f772d35f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsv6.6.0-beta1Qt Submodule Update Bot2023-06-081-2/+2
| | | | | Change-Id: If03c77242e6bd5e35d957ca7c8c5bd1862e8359f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* wasm: Fix MQTT over websocketsMorten Sørvig2023-06-071-1/+2
| | | | | | | | | Set state required by the requestedSubProtocols() call. Change-Id: Iafcc7cd7cf0a770355b10f5b3b2c407aef400ce5 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit e27da8cf0544a53f85acdccf3d16048e29c9b13a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove conanfile.pyTor Arne Vestbø2023-06-071-37/+0
| | | | | | | | | | The conan experiment has ended, and the file is only bitrotting nowadays. Change-Id: Ib9ba927ba50d67153f92a606dc3ce2c2ba818207 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 28e3f7c820946ad721730e7895825379c67c5057) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-06-061-2/+2
| | | | | Change-Id: I46adb1e6577c8733a55b5abdaeadd8f92bc19c05 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtwebsocketsQt Submodule Update Bot2023-06-061-2/+2
| | | | | Change-Id: I1ab40e18c788567d376e1f2e520155e8ae133975 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-06-051-2/+2
| | | | | Change-Id: Iaa16655bbade5d7ed0c687275fa8a9d82bd9d0dc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-06-021-2/+2
| | | | | Change-Id: Id72845ccada77372d0683da44228d445436fbf8f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-06-011-2/+2
| | | | | Change-Id: Ie5d06c10718cf3a6e2ec877fb3cac68cef86b65a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-05-291-2/+2
| | | | | Change-Id: Id1b920f69f55cd1b3885b44bc00ec61d4ef3fce0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-05-261-2/+2
| | | | | Change-Id: I664a13fc822e916a57230d7d4349efd07c55a615 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-05-241-2/+2
| | | | | Change-Id: Id97c6031f9eb017c4873d7d0fa3671d3ee2ad8a9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-05-221-2/+2
| | | | | Change-Id: I3e0e849c7c482bf0fd572558e683f523f4948f6f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2023-05-191-2/+2
| | | | | Change-Id: Iba602ec9c9ddc082be10c14fa113f55cacf00d05 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 03:29:43 +0000