summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-041-0/+20
|\
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
| |\
| | * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| | |\
| | | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-211-0/+20
| | |/
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-011-1/+1
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-311-2/+2
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-301-2/+2
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-301-1/+1
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-291-2/+2
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-291-2/+2
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-284-6/+6
|\ \ \ | |/ /
| * | Change QMap to QMultiMapMårten Nordheim2020-01-234-6/+6
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-271-2/+2
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-211-2/+2
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-211-2/+2
* | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2020-01-213-3/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-213-3/+1
| |\ \ \ | | |/ /
| | * | Stop forcing deprecated ssl protocol versionMårten Nordheim2020-01-172-2/+0
| | * | QWebSocket - do not use deprecated member-functionTimur Pocheptsov2020-01-151-1/+1
* | | | Use the new functions/signals introduced in QSslSocketLars Schmertmann2020-01-218-0/+122
|/ / /
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-311-0/+6021
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-301-0/+6021
| |\ \ | | |/
| | * Bump versionDaniel Smith2019-12-161-1/+1
| | * Add binary compatibility file for qtwebsockets 5.14 branchMilla Pohjanheimo2019-12-161-0/+6021
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-213-7/+37
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-143-7/+37
| |\ \ | | |/
| | * Remove extra deleteLater (already done in onSocketDisconnected)Franck Dude2019-12-131-1/+0
| | * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-132-6/+37
| | |\
| | | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Antti Kokko2019-11-261-0/+35
| | | * Don't add port in Host header unless specifiedLander Noterman2019-11-211-6/+2
| | |/
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-143-8/+41
|\ \ \ | |/ /
| * | Add protection against handshake header too largeFranck Dude2019-12-131-1/+9
| * | Fix websocket handshake request header parsingFranck Dude2019-12-133-8/+33
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-033-162/+26
|\ \ \ | |/ /
| * | Cleanup QWebSocketFrameChristian Ehrlicher2019-11-263-162/+26
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2019-11-281-2/+2
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2019-11-261-2/+2
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2019-11-251-2/+2
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2019-11-221-2/+2
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-191-25/+0
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-161-25/+0
| |\ \ | | |/
| | * Doc: Remove broken documentation commentsTopi Reinio2019-11-111-25/+0
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2019-11-131-2/+2
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2019-11-121-2/+2
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-121-0/+20
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
| |\ \ | | |/
| | * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
| | |\
| | | * Add changes file for Qt 5.13.2v5.13.25.13.25.13Antti Kokko2019-10-181-0/+20
| | | * Bump versionFrederik Gladhorn2019-10-141-1/+1
* | | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2019-11-081-2/+2