summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-159-120/+258
|\
| * Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2019-10-141-1/+1
| * Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2019-10-131-1/+1
| * Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2019-10-101-1/+1
| * Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2019-10-071-1/+1
| * Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2019-10-041-1/+1
| * Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2019-10-021-1/+1
| * Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2019-10-021-1/+1
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-011-3/+8
| |\
| | * Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-281-3/+8
| | |\
| | | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-281-3/+8
| | |/|
| | | * Fix JasPer version checkv5.14.0-beta1v5.14.0-alpha1Joerg Bornemann2019-09-191-3/+8
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2019-09-251-1/+1
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2019-09-191-0/+4
| * | | Merge "Merge remote-tracking branch 'origin/wip/qt6' into dev"Simon Hausmann2019-09-195-11/+10
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-09-185-11/+10
| | |\ \ \
| | | * \ \ Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"Simon Hausmann2019-09-166-26/+148
| | | |\ \ \
| | | | * | | Merge remote-tracking branch 'origin/dev' into wip/qt6Simon Hausmann2019-09-166-26/+148
| | | |/| | |
| | | * | | | Revert "Re-add dependencies.yaml now that qt5.git wip/qt6 builds fine"Alexandru Croitor2019-08-281-4/+0
| | | * | | | Re-add dependencies.yaml now that qt5.git wip/qt6 builds fineAlexandru Croitor2019-08-221-0/+4
| * | | | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Simon Hausmann2019-09-193-97/+107
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge remote-tracking branch 'origin/5.15' into devSimon Hausmann2019-09-193-97/+107
| |/| | | | | | | | |_|/ / | | |/| | |
| | * | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Simon Hausmann2019-09-193-97/+107
| | |\ \ \ \
| | | * | | | Merge remote-tracking branch 'origin/5.14' into 5.15Simon Hausmann2019-09-193-97/+107
| | |/| | | | | | | | |_|/ | | | |/| |
| | | * | | Fix and re-work compile testsJoerg Bornemann2019-09-181-97/+59
| | | * | | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-172-0/+48
| | | |\ \ \
| | | | * | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+48
| | | |/| | |
| | | | * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+24
| | | | |\ \ \
| | | | | * | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+24
| | | | |/| | |
| | | | | * | | Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+24
| | | | | |\ \ \
| | | | | | * | | Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+24
| | | | | |/| | |
| | | | | | * | | Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-231-0/+24
| | | | | |/ / /
| | | | * | | | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+24
| | | | |\ \ \ \
| | | | | * | | | Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+24
| | | | |/| | | |
| | | | | * | | | Merge 5.13 into 5.13.1v5.13.1Paul Wicking2019-08-061-3/+3
| | | | | |\ \ \ \
| | | | | * | | | | Add changes file for Qt 5.13.1Antti Kokko2019-07-311-0/+24
| * | | | | | | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-09-172-7/+4
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-172-7/+4
| |/| | | | | | | | | | |/ / / / / / /
| | * | | | | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-072-7/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-072-7/+4
| | |/| | | | | | | | | | |/ / / / / /
| | | * | | | | | Fix build after QColorSpace API changesTor Arne Vestbø2019-09-052-7/+4
| | * | | | | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-051-11/+14
| | |\ \ \ \ \ \ \
| | | * | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-051-11/+14
| | |/| | | | | | | | | | |/ / / / / /
| | | * | | | | | Merge "Merge dev into 5.14 (delayed final downmerge)"Kari Oikarinen2019-09-042-14/+55
| | | |\ \ \ \ \ \
| | | | * | | | | | Merge dev into 5.14 (delayed final downmerge)Kari Oikarinen2019-09-042-14/+55
| | | |/| | | | | |
| * | | | | | | | | Merge "Merge remote-tracking branch 'origin/5.14' into dev"Qt Forward Merge Bot2019-08-291-11/+14
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'origin/5.14' into devQt Forward Merge Bot2019-08-291-11/+14
| |/| | | | | | | | | | |/ / / / / / /
| | * | | | | | | Fix Android multi ABIs compilationBogDan Vatra2019-08-281-11/+14
| * | | | | | | | Bump versionKari Oikarinen2019-08-271-1/+1
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Support writing WebP color space profilesAllan Sandfeld Jensen2019-08-212-14/+55
| |/ / / / / /