summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix build with recent qtbasev5.15.0-beta2Allan Sandfeld Jensen2020-03-101-0/+1
| | | | | | | | We need to include QPainterPath when using it. Change-Id: I9f84aa3185de05d410e8355a5c4f6a556dbac5c0 Fixes: QTBUG-82788 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Remove overridden QSvgIOHandler::name()Shawn Rutledge2020-03-032-10/+0
| | | | | | | | We will remove the virtual base class function in Qt 6. For now, name() returns format(). Change-Id: Iee5bd4194d23178b3d8b602950cc5c01d097d44b Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-03-021-2/+2
| | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: Ieabf1eeb03b682f06344d0373de036f8f4534042 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-292-1/+18
|\ | | | | | | Change-Id: Ib7854f4ed3622f8545af5fa323350787229de921
| * Restrict nested use nodes processedAllan Sandfeld Jensen2020-02-262-1/+18
| | | | | | | | | | | | | | | | | | | | To avoid exponential blow up, limit the number of use nodes processed under a certain depth. This should still allow the common use of many shallow uses, but limit anything dangerous. Change-Id: I3af6dacb61c68350876fb03f056f02a287ea4e33 Fixes: QTBUG-82153 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Revert "Replace call to deprecated QNetworkReply::error method"Timur Pocheptsov2020-02-241-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit 88f30c3f5be38fb9cb6886a683a71ae792e61c61. Reason for revert: it was decided to use errorOccured as the name for the signal, thus we reverting this change. Change-Id: Ibc147869317e7d68162e677fcac08707d730ddb5 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Remove bearercloud examplev5.15.0-beta1Mårten Nordheim2020-02-1917-1814/+1
| | | | | | | | | | | | | | Bearer management is going away so this example cannot stay as it is Change-Id: I4d44158c95afc90f647741b99cf64ea18588cfb1 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | 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
* | 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>
* | 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>
* | 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>
* | 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>
* | 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>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+22
|\ \ | |/ | | | | Change-Id: I186367ec6aa745d73325ea88479d01b8f26708a3
| * 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>
* | Fix endl usage to contain prefixes and bump version to 6.0.0Alexandru Croitor2019-12-061-26/+26
| | | | | | | | | | | | Change-Id: Ia10879666a87dc4db596b75cfbf654379e75041b (cherry picked from commit 5c298ef5bea0930b68263ba84194250dbb9d26a9) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-252-5/+4
| | | | | | | | | | | | | | It is being deprecated. Change-Id: Ia8306d3874dc21d431fcb621e1f487f55b2bed8d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-163-9/+46
|\ \ | |/ | | | | Change-Id: I6d5d6b486fbd7d0d9324937e24edff2890f02bdf
| * 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.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
|\ \ | |/ | | | | Change-Id: Iba85f9231f1140b729687537dd1cda3a721712d6
| * 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
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-124-4/+4
|\ \ \ | |/ / | | | | | | Change-Id: Ifa21ce2b9073af555f6b47c2db9151f79ee58856
| * | 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.14' into 5.15"Qt Forward Merge Bot2019-09-212-0/+40
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-212-0/+40
| |\ \ \ |/ / / / | | _ / | | / Change-Id: Ie889dd2586d39c320e7faaf9f27007d49768239e
| * | 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