summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.05.12.0Antti Kokko2018-11-071-0/+39
* wasm: refactor and convert from EM_ASMv5.12.0-beta4v5.12.0-beta3v5.12.0-beta2v5.12.0-beta1Lorn Potter2018-10-012-137/+94
* Update plugins.qmltypesKai Koehne2018-09-273-2/+4
* Require Qt Network for Qt Web SocketsEskil Abrahamsen Blomfeldt2018-09-261-0/+1
* Add support for WebSockets on Qt for WASMLorn Potter2018-09-203-0/+245
* Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
|\
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\
| | * Add changes file for Qt 5.11.2v5.11.25.11.2Antti Kokko2018-08-291-0/+24
| |/
* | Fix implicit conversion warningJesus Fernandez2018-08-203-3/+120
* | Remove redundant options and a stray defineJesus Fernandez2018-08-1720-31/+20
* | Refactor manual testJesus Fernandez2018-08-161-89/+47
* | Use nullptr instead of 0Jesus Fernandez2018-08-141-1/+1
* | Remove unnecesary default labelJesus Fernandez2018-08-141-2/+0
* | Fix conversion warningsJesus Fernandez2018-08-143-10/+14
* | Use QObjectPrivate::q_ptr instead of shadowing itJesus Fernandez2018-08-146-37/+25
* | Use nullptr instead of 0Jesus Fernandez2018-08-103-3/+3
* | Use override keywordJesus Fernandez2018-08-1013-20/+20
* | Fix C-style castJesus Fernandez2018-08-101-3/+3
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-08-073-4/+40
|\ \ | |/
| * Limit Close frame to 125 bytesMårten Nordheim2018-08-063-4/+40
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\ \ | |/
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-031-1/+2
|\ \ | |/
| * Migrate tst_handshakeresponse to QRegularExpressionSamuel Gaist2018-06-301-1/+2
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-0/+24
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| |\
| | * Add changes file for Qt 5.11.1v5.11.15.11.1Antti Kokko2018-06-091-0/+24
| |/
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-121-0/+5472
|\ \ | |/
| * Add binary compatibility file for 5.11 for QtWebSocketsMilla Pohjanheimo2018-06-051-0/+5472
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-042-0/+48
|\ \ | |/
| * Add changes file for Qt 5.9.6Antti Kokko2018-06-041-0/+24
| * Add changes file for Qt 5.9.5Antti Kokko2018-06-041-0/+24
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
* | Use QUrl::toString() when forming the 'Host' headerTimur Pocheptsov2018-05-161-10/+12
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+22
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
| |\
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.05.11.0Antti Kokko2018-04-251-0/+22
| |/
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+1
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-211-2/+0
|\ \ | |/
| * QWebSocket: fix bytesWritten being emitted twiceMårten Nordheim2018-04-181-2/+0
* | QWebSocket: Add 'bytesToWrite'Mårten Nordheim2018-04-144-0/+31
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-072-3/+9
|\ \ | |/
| * Doc: Add license section to overviewv5.11.0-beta4Kai Koehne2018-04-051-0/+9
| * Remove incorrect license information from README.mdKai Koehne2018-04-051-3/+0
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-242-3/+4
|\ \ | |/
| * Make QWebSocketServer work with Safariv5.11.0-beta3Morten Johan Sørvig2018-03-222-3/+4
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-271-0/+26
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
| |\
| | * Bump versionOswald Buddenhagen2018-02-021-1/+1
| * | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
| |\ \