summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Use QStringLiteral to fix clazy-qstring-allocationsAndré Klitzing2017-10-301-1/+1
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-114-15/+15
|\
| * Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2Liang Qi2017-10-112-11/+12
| |\
| | * Replace iterator based loop by range-for-loopAndré Klitzing2017-10-101-9/+9
| | * Change assert to null-checkMårten Nordheim2017-09-201-1/+2
| | * 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
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-2611-18/+18
|/ /
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-alpha1Liang Qi2017-08-151-11/+0
|\ \ | |/
| * Remove workaround for unsupported compilerJake Petroules2017-08-141-11/+0
* | Change the mask generator to use QRandomGenerator instead of qs?randThiago Macieira2017-06-303-12/+12
|/
* Replace comment with Q_FALLTHROUGHJesus Fernandez2017-05-041-3/+3
* QQmlWebSocket::setUrl(): let open() decided what to actually doEdward Welbourne2017-05-041-3/+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
* Add a function to hand off a tcp socket to the websocket serverAleksey Lysenko2017-01-274-11/+35
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-257-27/+29
|\
| * Fix the parser of port in hand shake requestLiang Qi2017-01-061-10/+6
| * Fixed possible block clearing in QWebSocketDataProcessor::process methodAleksey Lysenko2017-01-041-5/+9
| * Fixed wrong scheme for secure websocketAleksey Lysenko2016-12-161-1/+1
| * 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-261-1/+1
| |\
| | * 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-213-12/+8
|\ \ \ \ | |/ / /
| * | | Eradicate Q_FOREACH and Java-style loops and mark the module as Q_FOREACH-freeMarc Mutz2016-09-073-13/+10
| * | | Fix loading of QML pluginsv5.8.0-alpha1Simon Hausmann2016-08-291-1/+1
* | | | Eradicate Q_FOREACH loopsAndré Klitzing2016-08-232-2/+3
|/ / /
* | | Clean up QT_CONFIG usageLars Knoll2016-08-191-1/+1
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-022-5/+11
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-012-5/+11
| |\ \ | | |/
| | * Fixed erroneous detection of server disconnect conditionOleksandr Tymoshenko2016-06-201-1/+1
| | * Doc: Also mention QML Import in index pageKai Koehne2016-05-231-4/+10
* | | Add support for TLS PSK (client and server)André Klitzing2016-06-128-0/+55
* | | Doc: Update WebSockets import to 1.1Kai Koehne2016-05-261-2/+2
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-241-1/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-191-1/+1
| |\ \ | | |/
| | * Doc: Remove repository name from examplesinstallpathv5.6.1-1v5.6.15.6.1Topi Reinio2016-05-121-1/+1
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-0818-56/+204
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-0814-53/+193
| |\ \ | | |/
| | * Fix possible hang on handshakeKai Koehne2016-04-071-2/+5
| | * Doc: Avoid auto-linking of WebSocket, WebSocketsKai Koehne2016-04-073-3/+23
| | * Doc: Add external-resources.qdocKai Koehne2016-04-0711-38/+136
| | * Merge remote-tracking branch 'origin/5.6.0' into 5.6Frederik Gladhorn2016-03-171-10/+9
| | |\
| | | * Doc: Remove reference to Qt Cloud servicev5.6.0-rc1v5.6.05.6.0Venugopal Shivashankar2016-02-151-10/+9
| | * | Update the QWebSocket's QSslConfiguration when neededAndy Shaw2016-03-102-0/+20
View Lorry Controller Status