summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.05.10.0Liang Qi2017-11-211-0/+26
|\
| * Add changes file for Qt 5.9.3v5.9.35.9.3Antti Kokko2017-11-081-0/+26
* | 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
* | 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.25.9.2Liang Qi2017-09-281-0/+18
| * Change assert to null-checkMårten Nordheim2017-09-201-1/+2
| * Add change file for Qt 5.6.3Liang Qi2017-09-011-0/+24
| * Fix releaseConnectionsAlan Alpert2017-08-291-1/+1
* | Replace Q_ENUMS by Q_ENUMAndré Klitzing2017-10-102-3/+2
* | Use multi-arg instead of multiple arg callsAndré Klitzing2017-10-091-1/+1
* | Revamp WebSocket's simple-chat examplev5.10.0-beta1Mårten Nordheim2017-09-284-23/+41
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-alpha1Liang Qi2017-08-153-11/+5175
|\ \ | |/
| * Remove workaround for unsupported compilerJake Petroules2017-08-141-11/+0
| * Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-301-0/+24
| |\
| | * Add changes file for 5.9.1v5.9.15.9.1Jani Heikkinen2017-06-231-0/+24
| * | Bump versionOswald Buddenhagen2017-06-301-1/+1
| * | Update binary compatibility file for Qt 5.9.0 for QtWebSocketsMilla Pohjanheimo2017-06-301-0/+5151
| |/
* | Enable tests for boot2qtSami Nurmenniemi2017-07-194-7/+57
* | Change the mask generator to use QRandomGenerator instead of qs?randThiago Macieira2017-06-303-12/+12
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-0715-1414/+5225
|\ \ | |/
| * Explain how to run the manual testJesus Fernandez2017-05-311-0/+6
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+39
| |\
| | * Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.05.9.0Jani Heikkinen2017-05-151-0/+39
| * | Bump versionOswald Buddenhagen2017-05-101-1/+1
| * | Disable/blacklist failing tests for boot2qtSami Nurmenniemi2017-05-092-0/+6
| * | Fix licensingJani Heikkinen2017-05-054-1397/+0
| * | Replace comment with Q_FALLTHROUGHJesus Fernandez2017-05-041-3/+3
| * | QQmlWebSocket::setUrl(): let open() decided what to actually doEdward Welbourne2017-05-041-3/+1
| |/
| * Fix QtWebSockets manual test buildv5.9.0-beta4Jesus Fernandez2017-05-031-1/+1
| * Move Q_REQUIRED_RESULT to the beginning of the declarationThiago Macieira2017-04-271-7/+8
| * Fix build for -no-feature-textcodecStephan Binner2017-04-271-2/+4
| * Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta3v5.9.0-beta2v5.9.0-beta1Liang Qi2017-03-103-1/+5153
| |\
| | * Exclude console application tests on UIKit platforms5.8Jake Petroules2017-02-221-1/+1
| | * Binary compatibility file for qtwebsockets (5.8.0)Milla Pohjanheimo2017-02-031-0/+5131
| | * Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-261-0/+21
| | |\
| | | * Add changes file for 5.8.0v5.8.0-rc1v5.8.05.8.0Jani Heikkinen2016-12-151-0/+21
| * | | Force QWebSocketProtocol header file creationv5.9.0-alpha1Timur Pocheptsov2017-02-061-0/+4
* | | | Bump versionOswald Buddenhagen2017-02-021-1/+1
|/ / /
* | | Add a function to hand off a tcp socket to the websocket serverAleksey Lysenko2017-01-275-11/+69
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-2518-40/+10404
|\ \ \ | |/ /
| * | Fix the parser of port in hand shake requestLiang Qi2017-01-062-10/+109
| * | Fixed possible block clearing in QWebSocketDataProcessor::process methodAleksey Lysenko2017-01-042-13/+55