summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Bump versionOswald Buddenhagen2017-01-031-1/+1
| * | Fixed wrong scheme for secure websocketAleksey Lysenko2016-12-166-1/+110
| * | Fixed QWebSocketServer::SslMode collisionAleksey Lysenko2016-12-141-2/+2
| * | Delete disconnected socketAleksey Lysenko2016-12-132-3/+5
| * | Fixed WebSocket status docAleksey Lysenko2016-12-131-5/+5
| |/
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-265-6/+10118
| |\
| | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-241-5/+0
| | |\
| | | * remove dependencies from sync.profileOswald Buddenhagen2016-11-061-5/+0
| | * | Binary compatibility file for QtWebSockets (5.7)v5.7.15.7.1Milla Pohjanheimo2016-10-041-0/+5096
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-012-0/+5021
| | |\ \ | | | |/
| | | * Added binary compatibility data files to QtWebSockets for Qt 5.6Milla Pohjanheimo2016-09-302-0/+5021
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-171-1/+1
| | |\ \ | | | |/
| | | * Doc: Add verb to WebSockets introv5.6.25.6.2Kai Koehne2016-08-121-1/+1
* | | | Remove support for WinRT 8.1 and Windows Phone 8.1Maurice Kalinowski2017-01-191-2/+2
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-217-17/+13
|\ \ \ \ | |/ / /
| * | | Make sure we find the ssl feature from QtNetworkv5.8.0-beta1Lars Knoll2016-09-141-0/+1
| * | | Eradicate Q_FOREACH and Java-style loops and mark the module as Q_FOREACH-freeMarc Mutz2016-09-076-18/+14
| * | | Fix loading of QML pluginsv5.8.0-alpha1Simon Hausmann2016-08-291-1/+1
* | | | Bump versionOswald Buddenhagen2016-08-291-1/+1