Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/5.12.3' into 5.12 | Qt Forward Merge Bot | 2019-04-17 | 1 | -0/+20 |
|\ | |||||
| * | Add changes file for Qt 5.12.3v5.12.35.12.3 | Antti Kokko | 2019-04-02 | 1 | -0/+20 |
|/ | |||||
* | Bump version | Kari Oikarinen | 2019-03-21 | 1 | -1/+1 |
* | Merge remote-tracking branch 'origin/5.12.2' into 5.12 | Qt Forward Merge Bot | 2019-03-15 | 1 | -0/+20 |
|\ | |||||
| * | Add changes file for Qt 5.12.2v5.12.25.12.2 | Antti Kokko | 2019-02-21 | 1 | -0/+20 |
|/ | |||||
* | Merge remote-tracking branch 'origin/5.12.1' into 5.12 | Qt Forward Merge Bot | 2019-02-01 | 2 | -0/+5622 |
|\ | |||||
| * | Add changes file for Qt 5.12.1v5.12.15.12.1 | Antti Kokko | 2019-01-15 | 1 | -0/+20 |
| * | Merge 5.12 into 5.12.1 | Kari Oikarinen | 2019-01-08 | 4 | -2/+26 |
| |\ | |||||
| * | | Add binary comaptibility file for QtWebSockets for Qt 5.12 | Milla Pohjanheimo | 2018-12-18 | 1 | -0/+5602 |
* | | | Bump version | Kari Oikarinen | 2019-01-14 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Bump version | Kari Oikarinen | 2019-01-07 | 1 | -1/+1 |
* | | wasm: set and update socket state | Lorn Potter | 2019-01-04 | 2 | -1/+5 |
* | | Merge remote-tracking branch 'origin/5.11' into 5.12 | Qt Forward Merge Bot | 2018-12-11 | 1 | -0/+20 |
|\ \ | |/ |/| | |||||
| * | Merge remote-tracking branch 'origin/5.11.3' into 5.11 | Qt Forward Merge Bot | 2018-12-04 | 1 | -0/+20 |
| |\ | |||||
| | * | Add changes file for Qt 5.11.3v5.11.35.11.3 | Antti Kokko | 2018-11-19 | 1 | -0/+20 |
* | | | Merge remote-tracking branch 'origin/5.12.0' into 5.12 | Qt Forward Merge Bot | 2018-12-05 | 1 | -0/+39 |
|\ \ \ | |||||
| * | | | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.05.12.0 | Antti Kokko | 2018-11-07 | 1 | -0/+39 |
* | | | | Merge remote-tracking branch 'origin/5.11' into 5.12 | Qt Forward Merge Bot | 2018-11-24 | 1 | -0/+5 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | tst_qwebsocketserver: force TLS 1.2 for the PSK test | Mårten Nordheim | 2018-11-23 | 1 | -0/+5 |
| | |/ | |/| | |||||
* | | | Merge remote-tracking branch 'origin/5.11' into 5.12 | Qt Forward Merge Bot | 2018-11-16 | 0 | -0/+0 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | Bump version | Oswald Buddenhagen | 2018-11-08 | 1 | -1/+1 |
* | | wasm: refactor and convert from EM_ASMv5.12.0-beta4v5.12.0-beta3v5.12.0-beta2v5.12.0-beta1 | Lorn Potter | 2018-10-01 | 2 | -137/+94 |
* | | Update plugins.qmltypes | Kai Koehne | 2018-09-27 | 3 | -2/+4 |
* | | Require Qt Network for Qt Web Sockets | Eskil Abrahamsen Blomfeldt | 2018-09-26 | 1 | -0/+1 |
* | | Add support for WebSockets on Qt for WASM | Lorn Potter | 2018-09-20 | 3 | -0/+245 |
* | | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1 | Qt Forward Merge Bot | 2018-09-11 | 1 | -0/+24 |
|\ \ | |/ | |||||
| * | Merge remote-tracking branch 'origin/5.11.2' into 5.11 | Qt Forward Merge Bot | 2018-09-09 | 1 | -0/+24 |
| |\ | |||||
| | * | Add changes file for Qt 5.11.2v5.11.25.11.2 | Antti Kokko | 2018-08-29 | 1 | -0/+24 |
| |/ | |||||
* | | Fix implicit conversion warning | Jesus Fernandez | 2018-08-20 | 3 | -3/+120 |
* | | Remove redundant options and a stray define | Jesus Fernandez | 2018-08-17 | 20 | -31/+20 |
* | | Refactor manual test | Jesus Fernandez | 2018-08-16 | 1 | -89/+47 |
* | | Use nullptr instead of 0 | Jesus Fernandez | 2018-08-14 | 1 | -1/+1 |
* | | Remove unnecesary default label | Jesus Fernandez | 2018-08-14 | 1 | -2/+0 |
* | | Fix conversion warnings | Jesus Fernandez | 2018-08-14 | 3 | -10/+14 |
* | | Use QObjectPrivate::q_ptr instead of shadowing it | Jesus Fernandez | 2018-08-14 | 6 | -37/+25 |
* | | Use nullptr instead of 0 | Jesus Fernandez | 2018-08-10 | 3 | -3/+3 |
* | | Use override keyword | Jesus Fernandez | 2018-08-10 | 13 | -20/+20 |
* | | Fix C-style cast | Jesus Fernandez | 2018-08-10 | 1 | -3/+3 |
* | | Merge remote-tracking branch 'origin/5.11' into dev | Qt Forward Merge Bot | 2018-08-07 | 3 | -4/+40 |
|\ \ | |/ | |||||
| * | Limit Close frame to 125 bytes | Mårten Nordheim | 2018-08-06 | 3 | -4/+40 |
* | | Merge remote-tracking branch 'origin/5.11' into dev | Qt Forward Merge Bot | 2018-07-31 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | Bump version | Oswald Buddenhagen | 2018-07-30 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'origin/5.11' into dev | Qt Forward Merge Bot | 2018-07-03 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Migrate tst_handshakeresponse to QRegularExpression | Samuel Gaist | 2018-06-30 | 1 | -1/+2 |
* | | Merge remote-tracking branch 'origin/5.11' into dev | Qt Forward Merge Bot | 2018-06-23 | 1 | -0/+24 |
|\ \ | |/ | |||||
| * | Merge remote-tracking branch 'origin/5.11.1' into 5.11 | Qt Forward Merge Bot | 2018-06-19 | 1 | -0/+24 |
| |\ | |||||
| | * | Add changes file for Qt 5.11.1v5.11.15.11.1 | Antti Kokko | 2018-06-09 | 1 | -0/+24 |
| |/ | |||||
* | | Merge remote-tracking branch 'origin/5.11' into dev | Qt Forward Merge Bot | 2018-06-12 | 1 | -0/+5472 |
|\ \ | |/ | |||||
| * | Add binary compatibility file for 5.11 for QtWebSockets | Milla Pohjanheimo | 2018-06-05 | 1 | -0/+5472 |
* | | Merge remote-tracking branch 'origin/5.11' into dev | Qt Forward Merge Bot | 2018-06-04 | 2 | -0/+48 |
|\ \ | |/ |