summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocketframe.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-151-2/+2
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I42592e133b25ebd271b387353a868b68825291d5
| * Fix typos in translated messages.v5.6.0-beta1Friedemann Kleint2015-10-221-2/+2
| | | | | | | | | | | | Change-Id: I373d3a174ed5c9d53fddb7254b04628f2ee8526d Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Robert Loehning <robert.loehning@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>
* rsv1-3 should be bool instead of intLiang Qi2015-09-141-39/+15
| | | | | | | | | And reorded the data members of QWebSocketFrame to save some space. Change-Id: I6fdaf74f344ac84e5a3f19883309455503a7ec4c Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Maks Naumov <maksqwe1@ukr.net> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Fix copy constructorLuca Niccoli2015-04-091-1/+1
| | | | | | Change-Id: I2c27bda6523ff84d9ea9178f1e6728bf4defc511 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-251-2/+2
|\ | | | | | | Change-Id: I218b5069480f60b88390c8540f01c3dbbee485d0
| * Fix the build for WinRT/ARMLiang Qi2015-02-231-2/+2
| | | | | | | | | | | | Task-number: QTBUG-44491 Change-Id: Iec007ff83414d333d10609882b11ab4fd485345a Reviewed-by: Oliver Wolff <oliver.wolff@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>
* Fix the translation in QWebSocketFrameLiang Qi2015-02-101-13/+13
| | | | | | Task-number: QTBUG-38740 Change-Id: If8df86990686af6811ad3bb21f93448ced946b6c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.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>
* WinRT: Fix compiler crash (msvc2013 arm)Maurice Kalinowski2014-08-131-0/+11
| | | | | | | | | Visual Studio 2013 Update 3 ARM compiler has issues with the code path trying to optimize it. Instead of disabling optimization in general, use a pragma for the function. x86 compilation is fine though. Change-Id: If099f7d1400cb78958d10c2fd35daef3bb75fc91 Reviewed-by: Andrew Knight <andrew.knight@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>
* Fix non-strict warning from AutoBahnKurt Pattyn2014-02-161-2/+0
| | | | | | | | When the reserved bits were set to 3, then the connection was aborted. No a close message is sent before the connection is closed. Change-Id: Iab365a4720c6588e5c6ac73813f63d26c3312265 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-1/+1
| | | | | | | | 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-18/+18
| | | | | Change-Id: Id72fe27cec606e7f02b8e9ac1d0d763890e86a95 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add a few more const refsFrederik Gladhorn2014-01-181-1/+1
| | | | | | | | | In case of processPing we need to make a copy that potentially detaches when masking is requested, but pings are < 125 bytes. Before this code would copy the byte array in the same way much earlier. Change-Id: If0592bb4b508eeb11fdbf05c4bb98b9679ed0549 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Remove _p suffix from cpp filenames.Kurt Pattyn2014-01-131-0/+561
Change-Id: I425aa372fe2f4114939f2691f270644e66017276 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
View Lorry Controller Status