summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-09-021-1/+1
| | | | | Change-Id: I23676b835f59da9e7f97e5384265b8cc951ce3d4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsv6.2.0-beta4Qt Submodule Update Bot2021-09-021-2/+2
| | | | | Change-Id: I04a5486a4aa45e8296e45c0be2bc517ce12bada2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-09-011-2/+2
| | | | | Change-Id: Icde1a1ea43470df119bf28eb773faa0fca2c41ca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-09-011-2/+2
| | | | | Change-Id: Ibf972c2e7a5b908d022388af9e36a52e483bcfc4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-08-311-2/+2
| | | | | Change-Id: Iba4c6341f3ec660c414cd93c92b57e6b14b38aba Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-08-301-2/+2
| | | | | Change-Id: I0b5e8e7116334a40010983730288300830c2bea9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Support builds with ConanIikka Eklund2021-08-262-0/+63
| | | | | | | | | | | | | | | | | | | Provide conanfile.py recipe to support building this module with Conan. The conanfile.py recipe inherits the main functionality from base class located in qt-conan-common.git. 'qt-configure-module(.bat)' and cmake is used for the builds. Dependencies (Conan requirements) are defined by the base class implementation which reads those from the 'dependencies.yaml' which is also used by the Coin/CI. Task-number: QTBUG-94825 Change-Id: Ieeaa8d9c0bf44d86318753fc6b4ffe2fa14f7dc9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit dce25ec66db622f3e4545ef870cec394d8b5c374) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update changes doc with the singular changeAllan Sandfeld Jensen2021-08-252-0/+41
| | | | | | | | | | Only the removal of the deprecated API. Fixes: QTBUG-94932 Change-Id: Ib7de6b11701d4f39273eb33e75e1cc8fe2deeae3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit f9cd291d9713fa67969a6f20738efdc624a2c0c5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-08-251-2/+2
| | | | | Change-Id: I707c0b79bc89d02a3d0ee2a2a759981058625de3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-08-211-2/+2
| | | | | Change-Id: Id6d9d43d6e03706fa87bb1a057bb93d498fc3c25 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Reinstate transitional methodsAllan Sandfeld Jensen2021-08-201-0/+6
| | | | | | | | | | These were introduced in Qt5 as transitional methods, and deprecating the main methods. They should still be here to support API conversion. Change-Id: I251c97dca527971bf966335288855aeea10572d2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit ddbddd249e0df85a35054ea9bdb88451e9f35fb1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-08-201-2/+2
| | | | | Change-Id: Ica89b30fba12744a5c3e020b0418de9f57b6398c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-08-191-2/+2
| | | | | Change-Id: I2216ddf5e3536acec442605fd39230d38ce56329 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-08-181-2/+2
| | | | | Change-Id: I69018aec76584d7f44dc477222b3695ca5645c75 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-08-171-2/+2
| | | | | Change-Id: Id20b33b73e2d0b43f2764d99a6721e1591f967fe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-08-171-2/+2
| | | | | Change-Id: I208cf07af1ce45aab7152d0599a9d80b9f62428e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Raise cmake_minimum_required to VERSION 3.16 in examplesJoerg Bornemann2021-08-177-7/+7
| | | | | | | | Task-number: QTBUG-95636 Change-Id: I65f6b8794ee47405d888636be7dd416f65c769f8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit b6a8d4bb3a98c46d0cbf5d98f6d3e4175d0a7c18) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-08-161-2/+2
| | | | | Change-Id: I2ebbf355e0f5eeceef5a0310413fe7c48a8d0974 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsv6.2.0-beta3Daniel Smith2021-08-121-2/+2
| | | | | Change-Id: Iddf30d67d9ea7143d4c3703338c370e99630b310 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Document new QWebSocketServer signalsKai Köhne2021-08-121-0/+41
| | | | | | | | | | Note that, in contrast to QWebSocket, QWebSocketServer misses the continueInterruptedHandshake() method. Change-Id: I6d38fa5a814732da40b1941decbe5cd7492bc39f Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 97a063f3f4887fc397d2819baa5a3ea8c4cf837f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-08-111-1/+1
| | | | | Change-Id: I6f6349db3fd4d082034a6f2f649cb92b51df038b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-08-101-2/+2
| | | | | Change-Id: Icb80dbb37e59c6196ce0fcc44eb2c0fec01cb112 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Add Changes Qt 5 to Qt 6 page to Qt WebSocketsPaul Wicking2021-08-041-0/+44
| | | | | | | | | | Add a basic changes page for consistency with other modules. Task-number: QTBUG-94932 Change-Id: I21428ba4bef08b4a9b50386d03c391d13f5545d0 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit f252d28b9130bcc3b9bd2e72a4357326b0216ca4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-08-041-2/+2
| | | | | Change-Id: I3a10f3928151a1b2d09ece81a145bda9b3dc2ec9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-08-021-1/+1
| | | | | Change-Id: I3246723a9463454c602ca6ec4f7fbb6272156ace Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-291-2/+2
| | | | | Change-Id: Ie3df51cc4588e0d415c94f574cb1cc646bf5633b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-281-2/+2
| | | | | Change-Id: Ib927fa28f8ab0f2bcf1707a5a8d550549c8d4622 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsv6.2.0-beta2Qt Submodule Update Bot2021-07-241-2/+2
| | | | | Change-Id: I438305ce403ce81c70c333b2e638595faa8a1f49 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-241-2/+2
| | | | | Change-Id: Id707a571f10f9e1a07b3fa10e14b2908b2650849 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-241-2/+2
| | | | | Change-Id: I5687cf8176ebc828458026d8d4e144f15ef203d1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-231-2/+2
| | | | | Change-Id: I81335dba65dfd86e10d66b10e591231dd17eedc3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-221-2/+2
| | | | | Change-Id: I740f549108bce1336718d5c36cef07b78be728c2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-221-2/+2
| | | | | Change-Id: I0531403f8f0424763fd49dfe680e8faf0a35c135 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-211-2/+2
| | | | | Change-Id: Idfb159152de12bc366bd52b3b3019f357ec4eea3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-201-2/+2
| | | | | Change-Id: I4214a193ad8e45664988a754b7a9df6c69c72e29 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-201-2/+2
| | | | | Change-Id: If1df2be39717372cf62e697bf70d3d1dccb84979 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-191-2/+2
| | | | | Change-Id: I32583e6ea998d8c610c792c36b752d4cdc3d6d5d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update since markersAllan Sandfeld Jensen2021-07-161-5/+5
| | | | | | | | | | Qt 6.2 will be first Qt 6 release for Qt WebSockets Change-Id: I2141785c3f5bf6604418e3d1b8d8c311c916400d Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 90331f7a248ce3da1947ca9ba671ca4958573264) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-161-2/+2
| | | | | Change-Id: I604f1a14b0c90cfebad92606812745d308d64b4b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-151-2/+2
| | | | | Change-Id: I5646fafef83190159a1020047e5f3a8c7465b591 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-141-2/+2
| | | | | Change-Id: I85e4c1411bc1c2befede3933304e9d927e56a3a8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-131-2/+2
| | | | | Change-Id: I5031a5502078c2e11b1e36773a48ac236674837c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-131-2/+2
| | | | | Change-Id: I00d6290d6a1f216e639dec732ff04a27450782eb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-121-1/+1
| | | | | Change-Id: I3999a6f3fd3b52db94ec3c417608516d3ee7eb01 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-121-2/+2
| | | | | Change-Id: Ic8106ef23052a293b2bcca8631497c7ad1f03683 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-091-2/+2
| | | | | Change-Id: I861352827ce5057fd5a600412e000cf5012835ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-081-2/+2
| | | | | Change-Id: Ia3abec558d88ccc60a2feb0e6006e527426014e5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Don't give plugins PUBLIC usage requirementsJoerg Bornemann2021-07-061-2/+1
| | | | | | | | | | | | | | | | | | | | | The pro2cmake.py conversion script faithfully reproduced the .pro files for the plugins, which specified the libraries as public. But in CMake, the implications of this are that public usage requirements should then be propagated to consumers. We don't expect any consumers, since a plugin is created as a MODULE library in CMake, so for Windows we don't even have an import library to link with. The only exception to this is for static builds where plugins are created as STATIC libraries instead, but only in certain controlled situations do we then link to plugins. Even then, usage requirements are not expected to propagate to the consumers, so these relationships should always be specified as private. Task-number: QTBUG-90819 Change-Id: I8a7cc92826709267cc44b210c64fb3940ea20eee Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit caa85ce2f1bb90c98d2096231b8f6eedf978c64a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-061-2/+2
| | | | | Change-Id: I6869a70a99ecf10be04b049a160d2931ceacc93a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebsocketsQt Submodule Update Bot2021-07-051-2/+2
| | | | | Change-Id: I93b3df15e50d79fb1fe154142863e2010de037d5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>