aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Use QElapsedTimer instead of QTime for the ping timerFriedemann Kleint2019-08-232-2/+4
| * | | Prospective fix for compilation with WebAssembly/MinGW73Friedemann Kleint2019-08-221-3/+6
* | | | Bump versionKari Oikarinen2019-08-271-1/+1
| |/ / |/| |
* | | Add the missing tests in tst_DataProcessor::frameTooSmallRyan Chu2019-08-231-3/+17
* | | Remove waitForReadyRead from QWebSocketFrame::readFrameRyan Chu2019-08-237-41/+103
* | | Make QWebSocketFrame::readFrame as a non-static public functionRyan Chu2019-08-235-25/+28
* | | Add an internal state to keep the processing state of frame readingRyan Chu2019-08-232-52/+41
* | | Divide QWebSocketFrame::readFrame into subroutinesRyan Chu2019-08-232-142/+167
|/ /
* | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-162-0/+21
|\ \
| * | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-162-0/+21
|/| | | |/
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-111-0/+20
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-111-0/+20
| | |\
| | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | | |/|
| | | | * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-231-0/+20
| | | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | |/
| * | / Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| |/ /
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-110-0/+0
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-110-0/+0
|/| | | | |/ /
| * | Bump versionFrederik Gladhorn2019-07-011-1/+1
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-292-3/+23
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-292-3/+23
|/| | | | |/ /
| * | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+18
| |\ \
| | * | Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+18
| |/| |
| | * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0Antti Kokko2019-05-031-0/+18
| * | | Doc: Complete parameter description several methodsNico Vertriest2019-06-181-3/+5
| |/ /
* | | Investigate tst_handshakeTimeout test flakinessMårten Nordheim2019-06-271-11/+25
* | | Remove usages of deprecated QLatin1LiteralSona Kurazyan2019-06-251-1/+1
* | | Fix deprecation warnings in QWebSocketHandshakeResponse::getHandshakeResponse()Friedemann Kleint2019-05-271-6/+18
* | | Fix compilation error when configured without SSLDimitrios Apostolou2019-06-031-0/+1
* | | tst_QWebSocketServer: Fix deprecation warnings about QSslSocket::supportedCip...Friedemann Kleint2019-05-271-1/+1