summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"HEAD5.12Qt Forward Merge Bot7 days2-1/+21
|\
| * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot7 days2-1/+21
| |\ |/ /
| * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| * Bump versionFrederik Gladhorn2019-05-231-1/+1
|/
* Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
|\
| * Add changes file for Qt 5.12.3v5.12.35.12.3Antti Kokko2019-04-021-0/+20
|/
* Bump versionKari Oikarinen2019-03-211-1/+1
* Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
|\
| * Add changes file for Qt 5.12.2v5.12.25.12.2Antti Kokko2019-02-211-0/+20
|/
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-012-0/+5622
|\
| * Add changes file for Qt 5.12.1v5.12.15.12.1Antti Kokko2019-01-151-0/+20
| * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-084-2/+26
| |\
| * | Add binary comaptibility file for QtWebSockets for Qt 5.12Milla Pohjanheimo2018-12-181-0/+5602
* | | Bump versionKari Oikarinen2019-01-141-1/+1
| |/ |/|
* | Bump versionKari Oikarinen2019-01-071-1/+1
* | wasm: set and update socket stateLorn Potter2019-01-042-1/+5
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
|\ \ | |/ |/|
| * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| |\
| | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-191-0/+20
* | | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+39
|\ \ \
| * | | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0Antti Kokko2018-11-071-0/+39
* | | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-241-0/+5
|\ \ \ \ | | |/ / | |/| |
| * | | tst_qwebsocketserver: force TLS 1.2 for the PSK testMårten Nordheim2018-11-231-0/+5
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
|\ \ \ | |/ / | | / | |/ |/|
| * Bump versionOswald Buddenhagen2018-11-081-1/+1
* | 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.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
| |\