summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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>
* Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+22
|\ | | | | | | Change-Id: I84b0aa93f181b1ec1308c0ef8db0941078feab43
| * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Antti Kokko2019-11-261-0/+22
|/ | | | | Change-Id: I0b0c676870bf088545dc5c8b01066cb4c50542b8 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Re-fix scaling when rendering a specific element by idAlessandro Portale2019-11-142-1/+39
| | | | | | | | | | | | | | | | | | | | | This is a modification of 14fa4591eb34a35cf3d485fd901e3f1e2caa7770 That patch corrected the handling of the view box when rendering an entire SVG document. However, contrary to intention stated in the comment of that patch, it turns out that the new viewbox handling code path can be taken also for the case of rendering only a single element by id. Instead, we want to keep the original behavior where the element's origin bounds are transformed to fit into the user requested target bounds, allowing non-proportional scaling. Since the render-single-element case is easily and uniqely identifiable by the sourceRect parameter being non-null, just add an explicit check for that to the code path branching. Done-with: Eirik Aavitsland <eirik.aavitsland@qt.io> Fixes: QTBUG-79933 Change-Id: I64a35bbb193db22c33670b48ea165a91df8e719e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* QSvgRenderer: Allow to remove a viewBoxAlessandro Portale2019-11-131-1/+1
| | | | | | | | | | m_implicitViewBox needs to be true if the explicit viewBox is null. That relationship between m_viewBox and m_implicitViewBox can be see in QSvgTinyDocument::viewBox(). Task-number: QTBUG-79933 Change-Id: I6ea5a849479b10117128bcaf1799e3770b145e77 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fuzzing: Don't copy input data to QByteArrayRobert Loehning2019-11-121-1/+1
| | | | | Change-Id: Ifb28491916bd30725bc460f7561a62b1933527c7 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Fix rendering of SVG with translating viewBoxEirik Aavitsland2019-11-112-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | This is a modification of14fa4591eb34a35cf3d485fd901e3f1e2caa7770. That change correctly implemented support for scaling and centering viewBox. However, the viewBox scaling and x-min/y-min translation was applied in the wrong order, so SVGs with a non-zero x-min/y-min viewBox would be rendered with an offset. The autotest reflected this error, and is also fixed here. (In user space, the black rectangle's upper left corner (0,0) is in the center of the viewBox and so should end up in the center of the produced image, independently of the scaling. All other tested SVG renderers place it there.) This change fixes all the reported regression cases from the above commit, while not re-breaking the original cases fixed by that commit. Fixes: QTBUG-79333 Fixes: QTBUG-78200 Task-number: QTBUG-70256 Change-Id: I0d3394e3caf6ec7edf16a10992c2fbfdac7398e5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I300b232530fa6d8694f16d0f7093d56698c23ab1
| * Add changes file for Qt 5.13.2v5.13.25.13.25.13Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | + fc2bc2db0ed8887253a2e0a41634e7d22af00283 Binary compatibility file against Qt5.13.0 for QtSvg + cd2d1245b8237aba4f64d8336b39e2635665564f Add changes file for Qt 5.12.5 Change-Id: Icd59e68a09fecf43d952e97328f402aeb6c008e9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | Change-Id: I40f0b2327f1b96062d97fca694d781ec7a01b4fd
* | Small performance improvements suggested by clang-tidyv5.14.0-beta2Albert Astals Cid2019-10-074-4/+4
| | | | | | | | | | | | | | | | | | | | * Add const & to function parameters * std::move an brush * Add const & to variables assigned from functions returning const & Change-Id: If412b78cc0198e24ce1c611fcd2026d0d723be80 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta1v5.14.0-alpha1Qt Forward Merge Bot2019-09-172-0/+40
|\ \
| * \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+40
| |\ \ |/ / / | | _ | | Change-Id: Ie0e99913d70244528415a0bb29ff6e9613486ece
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+20
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| | |\ | |/ / | | | | | | Change-Id: If64b06c1c25afae0fe98f60610d82fef0793c262
| | * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | | |\ | | |/ / | | | | | | | | Change-Id: I97aca0fd9290c1295751fd618d0189014f2c732a
| | | * Add changes file for Qt 5.12.5v5.12.55.12.5Antti Kokko2019-08-231-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | + b2f450146055360e6a25e80bc91753dd4d766bb1 Make QSvgGenerator test pass on Android + b540b304a39739ce1d630eb7a93b91926d25cbde Android: Fix QSVGPlugin test + 1cb4cd6e2d153bd1a4d53bfe4ccbeb6d8d269f55 Android: Skip QSVGRenderer test + 347de1dd25366015e3fbbc39ccd1a16ecb18eb2e Bump version Change-Id: Id2ea2664d0b9c350075673ce84c748939c2fe44a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| | |\ \ | |/ / / | | | | | | | | Change-Id: I4e6f18c0613a272328acbcc373e3dd2f4d736ddd
| | * | Add changes file for Qt 5.13.1v5.13.15.13.1Antti Kokko2019-08-091-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 5db971a48bb1a9ed5c4b51254e611d56680bd85a Bump version + 29249cf721863cdebdce5d48ded59e295f58a710 Add changes file for Qt 5.12.4 + b2f450146055360e6a25e80bc91753dd4d766bb1 Make QSvgGenerator test pass on Android + b540b304a39739ce1d630eb7a93b91926d25cbde Android: Fix QSVGPlugin test + 1cb4cd6e2d153bd1a4d53bfe4ccbeb6d8d269f55 Android: Skip QSVGRenderer test + 5fbdb5e5c361d42335427606f6bf9f461718d128 Bump version + 347de1dd25366015e3fbbc39ccd1a16ecb18eb2e Bump version + 7c82edc2b8dbbd4a1ae2fb43e288c6e3ffe6b401 Fix compilation with disabled deprecated APIs + fe105d59b5f96e8881d059aed8f238358b68455e Doc: Replace example file lists with links to code.qt.io Change-Id: I03b87c387c1e37eb172451076a8cf9576cd5c27c Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | Replace the deprecated QWheelEvent::delta() -> QWheelEvent::angleDelta()Sona Kurazyan2019-08-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced the deprecated QWheelEvent::delta() with the vertical component of angle delta, assuming that it's acceptable to have a single-dimension mouse wheel in the example code. Task-number: QTBUG-76491 Change-Id: I404d0bf80e22ef4ec3a11aa962f0389c150081cb Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-08-131-0/+19772
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-131-0/+19772
| |\ \ \ \ |/ / / / / | | _ / / | | / / Change-Id: I0ac8513a9a0bc6fc0ff03ad27e0f9ca5af1a2fcc
| * | | Binary compatibility file against Qt5.13.0 for QtSvgMilla Pohjanheimo2019-08-121-0/+19772
| |/ / | | | | | | | | | | | | | | | | | | BC file added Change-Id: I1d0d1950c35244b7968a5217c27ba38f498034d4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-163-2/+5
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-163-2/+5
| |\ \ \ |/ / / / | | _ / | | / Change-Id: I2c1925759a489dc23edba9d082025efc33418d18
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5f0336f7eccfb44223e5f3ace62ed2c691ebe863
| | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | Change-Id: I278f4280b8d088393e639e77eb9a51527a9560dd
| * | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I398a01a5af7ef88c24886d1c5549bd1fdbe7784c Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | | Fix compilation with disabled deprecated APIsSona Kurazyan2019-07-092-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The QImageIOHandler::name() has been deprecated since 5.13, but its overrides weren't. Enabled compilation of the overrides only when the QImageIOHandler::name() is compiled. Task-number: QTBUG-76491 Change-Id: Ida625f19d61081cfd50ae11ab50cf7829aef80a5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-110-0/+0
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-110-0/+0
| |\ \ \ |/ / / / | | _ / | | / | | | | | | | | | Conflicts: .qmake.conf Change-Id: I45da146d028d2f8f7b5661da514dead5e1a33f39
| * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: Ib71a71df6cffd5162ec732e942b24e69dd88f7d6
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-296-20/+42
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-296-20/+42
| |\ \ \ |/ / / / | | _ / | | / Change-Id: I3e08aa8666c4e74b70606a91bc2bc5653fac4003
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-286-20/+42
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-276-20/+42
| | |\ \ | |/ / / | | | _ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If39eda43ff21d841aaa24ffed8b5793ff1239cce
| | * Android: Skip QSVGRenderer testEskil Abrahamsen Blomfeldt2019-06-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests require access to local file system and are not written to be portable to remote devices. Since there is no real platform-dependency in this, testing them on other platforms is sufficient, so we will just skip it on Android rather than spend time on it. Task-number: QTBUG-73624 Change-Id: Ic11b69d2eb73e0cd264b153c9870dd7923e1336d Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * Android: Fix QSVGPlugin testEskil Abrahamsen Blomfeldt2019-06-252-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Assets have to be included in the resources in order to be accessible when testing on a remote device. Task-number: QTBUG-73625 Change-Id: I80332b6492bffc01c0157918b9e6abbc2b87a43b Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * Make QSvgGenerator test pass on AndroidEskil Abrahamsen Blomfeldt2019-05-142-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Platforms like Android require assets to be bundled with the app. We include the reference SVGs as resources to work around this. Task-number: QTBUG-73623 Change-Id: Id9cc7a7d575da5adbe73a3392419fd74a1ec1bbd Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | | |\ | | |/ / | | | | | | | | Change-Id: I695d5bc0c1f5d93f4880d0b687b36327a88497cf
| | | * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia8f0e8cc9e7e8f072358b4c179e7aedafb7d67ba Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>