summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtwebsocketsHEADdevQt Submodule Update Bot41 hours1-2/+2
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot3 days1-2/+2
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot6 days1-2/+2
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot6 days1-2/+2
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot7 days1-2/+2
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot7 days1-1/+1
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot8 days1-2/+2
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot8 days1-2/+2
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot9 days3-4/+46
|\
| * Merge remote-tracking branch 'origin/5.14' into 5.155.15Qt Forward Merge Bot12 days3-4/+46
| |\
| | * Add support for chrono versions of handshakeTimeout functionsMårten Nordheim2019-10-093-4/+46
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot9 days1-2/+2
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot11 days1-2/+2
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot13 days1-2/+2
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2019-10-081-2/+2
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2019-10-041-0/+7
* | | Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-10-041-1/+1
|\ \ \
| * | | Bump Qt version to Qt 6wip/qt6Alexandru Croitor2019-07-111-1/+1
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-013-4/+52
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-243-4/+52
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-243-4/+52
| | |\ \ \ | |/ / / / | | | | _
| | * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta1v5.14.0-alpha1Qt Forward Merge Bot2019-09-173-4/+52
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-173-4/+52
| | | |\ \ | | |/ / /
| | | * | wasm: make sendBinaryMessage work in threaded mode5.13Morten Johan Sørvig2019-09-131-4/+12
| | | * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-091-0/+20
| | | |\ \
| | | | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| | | | |\ \ | | | |/ / /
| | | | * | Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"5.12Qt Forward Merge Bot2019-09-081-0/+20
| | | | |\ \
| | | | | * \ Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | | | | |\ \ | | | | |/ / /
| | | | | * | Add changes file for Qt 5.12.5v5.12.55.12.5Antti Kokko2019-08-231-0/+20
| | | | |/ /
| | | * | | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
| | | |\ \ \
| | | | * \ \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| | | | |\ \ \ | | | |/ / / /
| | | | * | | Add changes file for Qt 5.13.1v5.13.15.13.1Antti Kokko2019-07-301-0/+20
* | | | | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-09-241-0/+5977
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-241-0/+5977
| |\ \ \ \ \ \ \ |/ / / / / / / / | | _ / / / / / | | / / / / /
| * | | | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-171-0/+5977
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-171-0/+5977
| | |\ \ \ \ \ \ | |/ / / / / / / | | | _ / / / / | | | / / / /
| | * | | | | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-031-0/+5977
| | |\ \ \ \ \
| | | * \ \ \ \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-031-0/+5977
| | | |\ \ \ \ \ | | |/ / / / / / | | | | _ / / / | | | | / / /
| | | * | | | Binary compatibility file against Qt5.13.0 for QtWebSocketsMilla Pohjanheimo2019-08-261-0/+5977
| | | |/ / /
* | | | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-09-171-0/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-171-0/+2
| |\ \ \ \ \ \ |/ / / / / / / | | _ / / / / | | / / / /
| * | | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-058-17/+56
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-058-17/+56
| | |\ \ \ \ \ | |/ / / / / / | | | _ / / / | | | / / /
| | * | | | Add missing \since 5.14 to new APIMårten Nordheim2019-08-301-0/+2
* | | | | | Merge "Merge remote-tracking branch 'origin/5.14' into dev"Qt Forward Merge Bot2019-08-297-17/+54
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge remote-tracking branch 'origin/5.14' into devQt Forward Merge Bot2019-08-297-17/+54
| |\ \ \ \ \ |/ / / / / / | | _ / / / | | / / /
| * | | | Take 2: Properly handle multiple websocket frames in one TCP frameMårten Nordheim2019-08-281-1/+1
| * | | | QWebsocket doesn't receive message with size larger than 1MRyan Chu2019-08-284-11/+15
| * | | | Merge dev into 5.14Kari Oikarinen2019-08-278-204/+297
| |\ \ \ \
| * | | | | Properly handle multiple websocket frames in one TCP frameMårten Nordheim2019-08-261-0/+28