summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"HEAD5.12Qt Forward Merge Bot8 days2-1/+21
|\
| * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot8 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
|/
* Fix generic conversion of list-like values to JSON arraysArno Rehn2019-05-152-1/+11
* 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/+25
|\
| * Add changes file for Qt 5.12.2v5.12.25.12.2Antti Kokko2019-02-261-0/+25
|/
* Also add already wrapped objects to the transport-to-objects mapArno Rehn2019-02-043-2/+23
* Correctly unwrap registered objectsArno Rehn2019-02-043-0/+23
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-012-0/+6137
|\
| * Add changes file for Qt 5.12.1v5.12.15.12.1Antti Kokko2019-01-101-0/+20
| * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-082-1/+21
| |\
| * | Add binary compatibility file for QtWebChannel for Qt 5.12Milla Pohjanheimo2018-12-181-0/+6117
* | | Correctly convert enums and QFlags from and to JSONArno Rehn2019-01-313-0/+91
* | | Remove warning when the notify signal has more than one argumentArno Rehn2019-01-231-5/+0
* | | Bump versionKari Oikarinen2019-01-141-1/+1
| |/ |/|
* | Bump versionKari Oikarinen2019-01-071-1/+1
* | 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
| |/
| * Bump versionOswald Buddenhagen2018-11-081-1/+1
* | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+18
|\ \
| * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0Antti Kokko2018-11-071-0/+18
|/ /
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta4v5.12.0-beta3v5.12.0-beta2v5.12.0-beta1v5.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-09-031-0/+24
| |/
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-08-251-0/+3
|\ \ | |/
| * Add initial configure.jsonMichal Klocek2018-08-211-0/+3
* | 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-06-233-0/+72
|\ \ | |/
| * Merge "Merge remote-tracking branch 'origin/5.11.1' into 5.11" into refs/stag...Qt Forward Merge Bot2018-06-191-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.1Antti Kokko2018-06-131-0/+24
| | |/
| * | Add changes file for Qt 5.9.6Antti Kokko2018-06-191-0/+24
| * | Add changes file for Qt 5.9.5Antti Kokko2018-06-191-0/+24
| |/
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-121-0/+5987
|\ \ | |/
| * Add binary compatibility file for 5.11 for QtWebChannelMilla Pohjanheimo2018-06-051-0/+5987
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-040-0/+0
|\ \ | |/
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-261-21/+9
|\ \ | |/
| * Use FDL license for all .qdoc filesKai Koehne2018-05-231-21/+9
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-191-0/+9
|\ \ | |/
| * Doc: Add license details to index pageKai Koehne2018-05-141-0/+9
* | 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.0Antti Kokko2018-04-251-0/+22
| |/