summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.11.2' into 5.11HEAD5.11Qt Forward Merge Bot10 days1-0/+24
|\
| * Add changes file for Qt 5.11.25.11.2Antti Kokko2018-08-291-0/+24
|/
* Limit Close frame to 125 bytesMårten Nordheim2018-08-063-4/+40
* Bump versionOswald Buddenhagen2018-07-301-1/+1
* Migrate tst_handshakeresponse to QRegularExpressionSamuel Gaist2018-06-301-1/+2
* Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
|\
| * Add changes file for Qt 5.11.1v5.11.15.11.1Antti Kokko2018-06-091-0/+24
|/
* Add binary compatibility file for 5.11 for QtWebSocketsMilla Pohjanheimo2018-06-051-0/+5472
* Add changes file for Qt 5.9.6Antti Kokko2018-06-041-0/+24
* Add changes file for Qt 5.9.5Antti Kokko2018-06-041-0/+24
* Bump versionOswald Buddenhagen2018-05-311-1/+1
* Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
|\
| * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.05.11.0Antti Kokko2018-04-251-0/+22
|/
* QWebSocket: fix bytesWritten being emitted twiceMårten Nordheim2018-04-181-2/+0
* Doc: Add license section to overviewv5.11.0-beta4Kai Koehne2018-04-051-0/+9
* Remove incorrect license information from README.mdKai Koehne2018-04-051-3/+0
* Make QWebSocketServer work with Safariv5.11.0-beta3Morten Johan Sørvig2018-03-222-3/+4
* Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
|\
| * Bump versionOswald Buddenhagen2018-02-021-1/+1
* | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
|\ \
| * | Add changes file for Qt 5.10.1v5.10.1Antti Kokko2018-02-061-0/+26
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-204-1/+5524
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-182-1/+26
| |\ \ | | |/
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| | |\
| | | * Add changes file for Qt 5.9.4v5.9.4Antti Kokko2018-01-081-0/+25
| | |/
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | * Fix apparently invalid auto-test (qmlwebsockets)Timur Pocheptsov2017-11-291-1/+1
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+26
| | |\
| * | | Add binary compatibility file for QtWebSockets for 5.10Milla Pohjanheimo2018-01-091-0/+5472
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+26
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Liang Qi2017-11-211-0/+26
| | |\ \ \ | |/ / / / | | | | _
| | * | Add changes file for Qt 5.9.3v5.9.3Antti Kokko2017-11-081-0/+26
| | |/
* | | Make HTTP header parsing RFC-compliantRobert Griebl2017-11-283-13/+81
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2012-61/+82
|\ \ \ | |/ /
| * | Add changes file for Qt 5.10.0Antti Kokko2017-11-141-0/+22
| * | Update to new QRandomGenerator APIv5.10.0-beta4Thiago Macieira2017-11-033-6/+6
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-308-56/+54
| |\ \ | | |/
| | * Fix empty sslConfiguration in sslErrors slotAndré Klitzing2017-10-272-3/+10
| | * Check count of spy to verify signalAndré Klitzing2017-10-271-31/+17
| | * Fix handshakeReceived not being invoked in some situationMårten Nordheim2017-10-271-0/+5
| | * Fix outdated FDL license headerKai Koehne2017-10-235-22/+22
* | | Replace typedefs by QOverloadAndré Klitzing2017-10-304-14/+10
* | | Use QStringLiteral to fix clazy-qstring-allocationsAndré Klitzing2017-10-301-1/+1
* | | test: fix tst_QWebSocket::tst_moveToThread()Liang Qi2017-10-261-2/+2
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-1110-37/+97
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2Liang Qi2017-10-114-11/+54
| |\ \ | | |/
| | * Replace iterator based loop by range-for-loopAndré Klitzing2017-10-101-9/+9
| | * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | * Add changes file for Qt 5.9.2v5.9.2Liang Qi2017-09-281-0/+18