summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Regenerate qtsvgwip/cmakeAlexandru Croitor2020-02-129-19/+23
| | | | | | Change-Id: I6f444b939e14263a5f9f4ac7fdfcd0f45ccaa453 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-02-1229-804/+20091
|\ | | | | | | Change-Id: I35cfe1a52ec4a02dccc0895e3b4a40bd2ffe7295
| * Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-02-091-1/+1
| | | | | | | | | | Change-Id: Iaedb03cb0edbf978eaa561107a8624b2a2a8be42 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-02-081-1/+1
| | | | | | | | | | Change-Id: I65eaf9d1b0a380145c5a8f803c79a73d5974078c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-02-081-1/+1
| | | | | | | | | | Change-Id: I265cba4dfafe5a8ffa8b6c78d7f90ba17d76ea8c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-080-0/+0
| |\ | | | | | | | | | Change-Id: Id5e971c94f1217435a699a3edd85138347850067
| | * Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia45146f4dce4df2a0bc9af4365be3832451a79a9
| | | * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ied2536c9ac3bfd69ec960690b4803765a81921bc
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I8d2d7f8f2a7be3d1ba0a2f1ed0fc26292d77a622 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Get rid of QMatrixJarek Kobus2020-02-063-35/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-81628 Change-Id: I31f5ffeff1e20f2c77a67325e58a0522d25cb1b7 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic497256897edd80036dd9dcbdeab589a226581b0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I56ddbe4c3db1cccbdc033c62ee6aea8b80501b62 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9452593e47c3d42b3129b2d634bee3bd954e9a08 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iec1e578f480d4c22919a0bf045830ec8a28843e3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-016-8/+85
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I4007f29077ec6a6ff34c7af730e6192cfd6202ba
| | * | Add API to enable opt-in aspect ratio feature in QSvgRendererEirik Aavitsland2020-01-285-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QSvgRenderer] Introduced aspect ratio mode property, so that rendering may be set to preserve the view box aspect ratio. Task-number: QTBUG-81259 Change-Id: I9802788cdaf2c30974c1ffc34ad5b67cdc74ed57 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-283-7/+39
| | |\ \ | | | |/ | | | | | | | | Change-Id: I987599c388f414928aabf6a193a8250c27f4f60d
| | | * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-273-7/+39
| | | |\ | | | | | | | | | | | | | | | Change-Id: Id0d3c97d6b5120c5386704e80fccef8b0242f000
| | | | * Revert the keep-aspectratio feature for 5.14.1v5.14.15.14.1Eirik Aavitsland2020-01-162-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced as non-optional behavior for 5.14.0, but caused many regressions. This patch reverts that, and instead prepares for introducing it as an opt-in feature in Qt 5.15. [ChangeLog][QSVGRenderer] In Qt 5.14.0, rendering would keep aspect ratio implied by the viewbox, independently of the specified target area. This caused many regressions with existing code, so is reverted now in 5.14.1. The feature will instead be available as an opt-in in Qt 5.15. Task-number: QTBUG-81259 Change-Id: I3efa2db864eb80ee00e8a067e56d9912bab36442 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | | | * Fix changes file according to latest changeEirik Aavitsland2020-01-161-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://codereview.qt-project.org/c/qt/qtsvg/+/286086 Change-Id: I085a4515eb80bae80e551cf976900f100132483a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | | | * Add changes file for Qt 5.14.1Antti Kokko2020-01-151-0/+28
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + f851e3213c8afac49f31a1506597e7f6783ee8c9 Add binary compatibility file for qtsvg 5.14 branch + 2eba1572ee49c22f4734b1fb80aa8023d60a8e70 Bump version + acb66cad2280bda20d26d08d606a66b9660b17aa Fix yet another viewbox scaling issue, for render to bounds Change-Id: I89b2a175cfa305eb54541b00e5bfeed16b5fe114 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id49b461c100f470d7f8425d012162d242ec246c2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I18c9589f4830f438a348d6c1d45969957abf4654 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I96d2fbd9ae59e1d77bcba40f041761d772e98d55 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id31dd926d3319b7380b7c4ab3d2dc85de0ab570e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I8532a57f6b43652625a3c01204b93f571bf0c5c1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I8a1aa85434ff1d41d9697764be3fc5d1213dec2f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If7c528e6b250b587e3bbab4a4bb0645096248912 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I4e4792ee75177ee6e24b26fe18ef488c52a20177 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-2110-36/+73
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I589e15e78ac980f326566e7543e0378c24e4088a
| | * | Don't use deprecated QMatrix class anymoreJarek Kobus2020-01-179-35/+72
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-46653 Change-Id: I9944b62141d7054e3935000a819bebc5fd54df6c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * | Replace call to deprecated QNetworkReply::error methodFabian Kosmale2020-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id95d1f09fa533e2993f446da965fa7cda81c473a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I2d62c5db857bcf2de093ff10fa4cf36c4420f820 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I4c3cca7f7c33bb5aebff4e3edcdbf7cd263d6262 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I12e733e42a5280a146a9f63c04e87a4bff005488 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-143-10/+41
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I535fa2bbee58d1cd15e1c25f0ac6321d502518fb
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-073-10/+41
| | |\ \ | | | |/ | | | | | | | | Change-Id: If6bf34ca3216ab9e0866d8c4eea7c4e92a7f3f4d
| | | * Fix yet another viewbox scaling issue, for render to boundsEirik Aavitsland2020-01-033-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recent introduction of keepAspectRation scaling led to wrong output (outside bounds) in the case of an explicitly specified target bounds rect, i.e. QSVGRenderer::render(QPainter *p, QRectF bounds). Fix by reverting to old code path in this case, i.e. allow the user to override the keepAspectRatio behavior by explicitly specifying target bounds. As a driveby, also fix the keepAspectRatio code path in case of a target rect having non-zero x/y coordinates. Now the fix above means that this will never happen in the code as it stands, but it may come in handy later. [ChangeLog][QSVGRenderer] From Qt 5.14.0, normal rendering will keep aspect ratio implied by the viewbox. The render() methods taking an explicit target bounds QRectF parameter can now be used to override that behavior. They will scale the output to the bounds while ignoring aspect ratio, as was the default rendering prior to 5.14.0. Fixes: QTBUG-80888 Change-Id: I399b05ca50d290b8e4b01bdc47b5b6f74c890c9a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I1454cc02ff45aef491278e9c027424b7282b2512 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iebec4569279992492d1efe1772a54426b9534bec Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I136e22b599b3a1095ea9e19156f903c10280b4c3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I0bb4db842cc3c1664c93c18763988db9f30064b3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I438bf3b431952a25d94bd5ecd8ae8826ec359414 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-071-1/+6
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I4f1731d136f6031eeadb5866333b24179884728d
| | * | Fuzzing: Allow linking to other fuzzing enginesRobert Loehning2020-01-031-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oss-fuzz sets the environment variable LIB_FUZZING_ENGINE to link with AFL or libFuzzer. If this variable is not set, libFuzzer will be used as before, only that the right qmake variable will be used for doing so. Change-Id: I024e1cb460d6777b50947c6622bcefc652c1338d Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2020-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I290711e35a634b559a8f62e43b24ef3fd722fc2a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-311-0/+19826
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I7d0a9b5cf005689cc1b8d85c02d4b985708f9996
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-301-0/+19826
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icdd813d576712aa52d6c7a1c5600882b4286f2ac
| | | * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | | | | | | | | | Change-Id: Icd9989d704ff07d7e7b8b516723dfd55ae491918
| | | * Add binary compatibility file for qtsvg 5.14 branchMilla Pohjanheimo2019-12-161-0/+19826
| | | | | | | | | | | | | | | | | | | | | | | | | | | | BC file built against 5.14.0 added. Change-Id: Ib26e7a17413883495ada0fa12c4ad2fd9e066359 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
View Lorry Controller Status