aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2Qt Forward Merge Bot2019-04-011-0/+25
|\
| * 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.2Antti Kokko2019-02-261-0/+25
| |/
* | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-262-2/+5
* | Doc: Fix some qdoc errorsNico Vertriest2019-03-251-2/+2
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Liang Qi2019-02-253-0/+40
|\|
| * 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' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-025-5/+6228
|\|
| * 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.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
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\| | |
| * | | Bump versionKari Oikarinen2019-01-141-1/+1
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\| |
| * | Bump versionKari Oikarinen2019-01-071-1/+1
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-151-0/+20
|\| |
| * | 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' into devQt Forward Merge Bot2018-12-081-0/+18
|\| |
| * | 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
| |/ /
* | | Prevent crashes by fixing mapping of transport to wrapped objectsMilian Wolff2018-10-253-2/+38
* | | Fix UBSAN warning when downcasting partially destroyed objectMilian Wolff2018-10-251-4/+6
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-151-0/+24
|\| |
| * | 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.12' into devQt Forward Merge Bot2018-09-011-0/+3
|\| |
| * | 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