summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocketprotocol.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-081-12/+6
|\ | | | | | | Change-Id: I7ebcdc16a8b65103abfb9640c990eddbeccdef05
| * Doc: Add external-resources.qdocKai Koehne2016-04-071-12/+6
| | | | | | | | | | | | | | | | | | Also sanitize some linking, e.g. by referencing to the paper by title, not by link. Change-Id: I95482994ca569001a23a3beb0e3cbe6739f4ed77 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-201-14/+20
|/ | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I8c17da1f7e2f0a620e3627fa7f8087f185545c8a Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-161-6/+6
| | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I8467410bfad44e8d3fe6bd5724c61bb0c07c91f9 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Improve the integration of QtWebsockets into general Qt docsv5.4.0-beta1Alex Blasche2014-09-281-0/+1
| | | | | | | | | | | | | 1.) The websocket qml types page is now hooked into Qt's QML Type by Module page. 2.) Correct incorrectly documented import statement for Qt.WebSockets module in QML. 3.) Add missing \since tags (see QTBUG-36775). Change-Id: I1321db70215fcd16cfbd77dd71a459244241d8a3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-241-18/+10
| | | | | | | - Added LICENSE.LGPLv3, LICENSE.GPLv2 & LICENSE.LGPLv21 Change-Id: I0586e35a7aa99be1b5b3bda580b05897f451acbf Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Use the proper protocol namesSze Howe Koh2014-04-091-2/+2
| | | | | | | | - "WebSocket" is one word, with uppercase 'W' and 'S'. - "HTTP"/"HTTPS" is fully uppercase Change-Id: Ice3a50c94394433c97f7347291af5cda69b234ce Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Adapt copyright headerKurt Pattyn2014-02-151-1/+1
| | | | | Change-Id: I9773492d3673d8aabdb4dd178be6af12eca7ba74 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Update documentationKurt Pattyn2014-02-011-3/+10
| | | | | | | | Clarified which versions are supported and that subprotocols and extensions are not supported. Fixed some typos. Change-Id: I99ef2fbbf74c287bea7d1b7a07881bf0542135ff Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Rename enumerations to comply with Qt styleKurt Pattyn2014-01-181-58/+64
| | | | | Change-Id: Id72fe27cec606e7f02b8e9ac1d0d763890e86a95 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Update documentationKurt Pattyn2014-01-131-0/+27
| | | | | Change-Id: I98cab390cbb0f19741d6fa4ae5b0ada8d19d1f5f Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Limit line length to 100 characters.Kurt Pattyn2014-01-121-25/+34
| | | | | Change-Id: I9da963570b174b9a5a33e65cf144402677b4bab5 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Enable docs for QWebSocketProtocolFrederik Gladhorn2014-01-111-0/+176
| | | | | | | | | | There is no advantage to haveing the cpp files have _p.cpp and as the public docs are in this file, rename it. In order to have the docs generated there needs to be a namespace page. Change-Id: Id6ef10ba39b7ea8b18d5d8e1cde03e566e682926 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Move non-public methods from websocketprotocol to private headerKurt Pattyn2013-11-021-188/+0
| | | | | | | Add bigendian conversion of masks to unit tests Change-Id: I3f23fb62aac1c6d06e5fafb1bd4bc47cc03765ce Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add correct license headersKurt Pattyn2013-11-011-18/+40
| | | | | Change-Id: I789cd780697aedbca7a90a5991df00b2c7e9ec98 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Call other mask function instead of implementing it twiceKurt Pattyn2013-10-131-18/+1
| | | | | Change-Id: Ib196422ed7de2da420010e89347c98a02affef9a Reviewed-by: Steven Ceuppens <steven.ceuppens@icloud.com>
* Added module QtWebSockets to documentationKurt Pattyn2013-10-051-0/+4
| | | | | Change-Id: Ic1707be7fed88c63b770d41e3dc600da545e4005 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Adapted documentatonKurt Pattyn2013-10-051-5/+5
| | | | | Change-Id: I6ffcc86b9bbc6efe27b7005a3df6f62f0d1a9293 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Added const to const variables, added QStringLiteralKurt Pattyn2013-09-291-7/+7
| | | | | | | Removed whitespace again to make sanity bot happy Change-Id: Ifb0ae2566af73759593b2c46ec9cf4c93d6f3fcc Reviewed-by: Steven Ceuppens <steven.ceuppens@icloud.com>
* Changes to integrate the websocket module as a full Qt Add-On moduleSteven Ceuppens2013-09-281-0/+179
- Changed project files to use Qt structure - Moved existing sources into subdirectory, to make room for moduels - Created a "import/qmlwebsocket" module skeleton (works, but needs to be extended) - Modified examples to not use "include(.pri)", but use "QT += websocket" - Added qml example skeleton (works, but no useful functionality yet) Project can be build with: $ qmake $ make $ make install Module can be used in other projects with QT += websockets Change-Id: I2123026958b264670dbf8a978dee76edf5855806 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
View Lorry Controller Status