summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.15.1v5.15.15.15.1Antti Kokko2020-09-011-0/+31
| | | | | | Pick-to: dev 5.15 Change-Id: I9319edddd80c420c4de8b3e4ccb83d0e26307970 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix check against division by zeroRobert Loehning2020-08-182-4/+13
| | | | | | | | | | | The squared values must not be zero. Since both are qreal, this can happen even when neither of them is zero itself. Fixes: oss-fuzz-24738 Change-Id: I61b2bc891e7e3831d4b6ee68b467db28c4f877d4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 7f1945c5fb492505db9a43853987eaf805291919) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Test rendering length which is fuzzy nullRobert Loehning2020-08-171-0/+12
| | | | | | | Change-Id: I1a21f70cc5ca2319d041c5db8900e69adcb9850d Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 990bc88510a377532e3d16bede90965c043e22a0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add binary compatibility file for 5.15 for QtSvgMilla Pohjanheimo2020-08-171-0/+19848
| | | | | | | Binary compatibility file added. Change-Id: I0176befe00e82cb17fbdfbe923b1cd004c490e19 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Don't divide by zeroRobert Loehning2020-08-041-0/+2
| | | | | | | | Fixes: oss-fuzz-24308 Change-Id: I628f073cc2ec99b18333d2831c53cd888ebc5780 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 3206ab23a01ff19850ebdce6ac0338ddb29b5b95) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Avoid endless recursion in SvgStructureNode::boundsRobert Loehning2020-07-302-2/+8
| | | | | | | | Fixes: oss-fuzz-24028 Change-Id: I2ddfcd494747f2857d56ce54bc9c4ee3f986ac3e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 3f11586d79566c9ceb311c6c4a1ea12078deed5d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use qFuzzyIsNull instead of isEmpty() on QRectFRobert Loehning2020-07-301-1/+1
| | | | | | | | | | | Avoids an integer overflow in QOutlineMapper Fixes: oss-fuzz-24131 Change-Id: I77a280640df4971e440d3f8888d2e7036a1f2e6a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 21ae1e161c933ffae38d42fe8191975d5ad8ee6e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: I3958f9394497b60514c3302cdd076d495bc8826b
* Avoid endless recursion when inflating gzipRobert Loehning2020-07-292-5/+6
| | | | | | | | Fixes: oss-fuzz-24146 Change-Id: I52a974e6a0694fb4afb50d932b2e99917c3034b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 8368111c76471a7415c29ba293848003fca2a4af) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Return nullptr instead of 0Robert Loehning2020-07-241-1/+1
| | | | | | | Change-Id: I200214f90ce399034dabc61b00d20f7def8d923d Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 0e1ea7b93388eca35814d3527584461074350f0f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix support for pattern brushes in svg generatorEirik Aavitsland2020-07-211-1/+1
| | | | | | | | | | A typo had left a stray semicolon in the id string. Fixes: QTBUG-84607 Change-Id: I8bd3e68ec2184a238ea949d555f88abb14cff2dc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 625ca761c7c88f80ee8217c820f1e1f60ca7ef4f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't divide by zeroVolker Hilsheimer2020-07-172-0/+11
| | | | | | | | | Fixes: oss-fuzz-23731 Change-Id: Ib21a32a30f7a204d263e6710f17567d91c6aae79 Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit a7941a5b82e1b8397e9d5f20e5a68c8aac37fb51) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use QTimeLine's easingCurve in preference to its curveShapeEdward Welbourne2020-07-161-1/+1
| | | | | | | | | | The curveShape shall be deprecated and is equivalent to setting the easingCurve. Change-Id: I96fb873680c37cb5f79378dcf33075636f0de82a Reviewed-by: hjk <hjk@qt.io> (cherry picked from commit 12ed3450e607daae76c519b5bcb1f7e7bfee583d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix stack overflow in dtor of QSvgTinyDocumentRobert Loehning2020-07-151-1/+10
| | | | | | | | | | | Add a maximum to how many unfinished elements will be parsed by QSvgHandler. Fixes: oss-fuzz-24000 Change-Id: I4cea0500d2bc503d2c509d091300dd1117170299 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 2fc2cb44b275c7c18c2db262eec443eb198b9cc6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add error handling to color parsingAllan Sandfeld Jensen2020-06-241-19/+22
| | | | | | | | | | | Also fixes undefined shift of negative values. Fixes oss-fuzz 23644 Change-Id: I08c998ebf2217cb8dc50fcb805603e01e67ad64b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 9a0d4ff631003a84205c61bd7a6ef843207f1675) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix stack overflow in QSvgHandler::resolveGradientsAllan Sandfeld Jensen2020-06-242-5/+7
| | | | | | | | | | | Add a maximum to how deep it will nest. Fixes oss-fuzz 23643 Change-Id: I6183c04f65a539a6c7df42bc7346a86ee58aca6c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 6b86b5de893e9885f8288af5a096444b30fa2628) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix oom in QSvgTinyDocument::loadAllan Sandfeld Jensen2020-06-231-0/+6
| | | | | | | | | | | | Avoid overflowing the size integer. Fixes ozz-fuzz 23606 Change-Id: Iaae2c1e78e59737bba0e34791de4a3a92677f319 Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 99a86c1bc347092d76f1288d901b30643b8eea6c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use QRect::isEmpty instead of QRect::isNullAllan Sandfeld Jensen2020-06-221-5/+5
| | | | | | | | | | | | Otherwise we can end up processing empty rects, and get divisions by zero. Fixes oss-fuzz issue 23633. Change-Id: I0415462712792cb6a00eadd510b1688e859c419c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit b5865df798323a63d8a89b8b50116888b930f3f0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Handle empty rectsAllan Sandfeld Jensen2020-06-221-10/+15
| | | | | | | | | | | | | Avoids a division by zero, also we don't appear to support auto sizes, so width and height are required attributes. Fixes oss-fuzz issue 23588. Change-Id: Ib3474c2ed4409977f6ffcf73088956c6c59ce4ad Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Robert Loehning <robert.loehning@qt.io> (cherry picked from commit 78cbbc1aa3a4802b2eeec8b5abfe196e05df1b16) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fuzzing: Prepare for running in oss-fuzzRobert Loehning2020-06-182-3/+8
| | | | | | | Change-Id: I05c3b030edace7215058a295a8d72bc5ecebc266 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> (cherry picked from commit b9c2828793e018a4e243a248e9a47e5e8ab5a125) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* svggenerator example: Remove custom slot definitionsFriedemann Kleint2020-05-182-72/+6
| | | | | | | | | | | They are a rather obscure feature of Qt Designer and should not be used in examples. Remove custom slot definitions of the form class and move the connections to C++. Change-Id: Ice068ecf269efaf5060d2457096417c7d0df0346 Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit 4b167ea939d8210982b0bdde17b73d9c9c8f1d4f) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+23
|\ | | | | | | Change-Id: Ie0ed81cdd82e1cbe4d61a67c9f8b080a5130df93
| * Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.05.15.0Qt Forward Merge Bot2020-04-221-0/+20
| |\ | |/ |/| | | Change-Id: Ib5cb4e33daffe0507ed16fddc9902cb2235f148b
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | | | | | | | | | Change-Id: I0e064729cac610a65dea065f3b422240d2ca989a
| * \ Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | | | | | | | | | | | Change-Id: I9f705f5a75428d4bb5e2607f87be33e5886a5ded
| | * | Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-101-0/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | + d072a505d7ff39d509b9c9e2de8722cd3549b4df Bump version + 45530ad4c5c6d3e90fe6d5a63f3bb551f37ad917 Restrict nested use nodes processed Change-Id: I54f868b94c0123948ce18ae67ad5e1b57c5433bb Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-221-0/+23
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 7831afe0d496794cdc7a7ffbf1b374120941c3ea Bump version + 1684d3122b7263787f2167668fd2b16a3738bf94 Remove usages of deprecated APIs of QDesktopWidget + 3c98af88f1051f6947cc6de1cfba57a1b1d6e0cd Avoid initializing QFlags with 0 or nullptr + feee51b300f70d9018720f4f7bfc53bea2c02e3f Fix endl usage to contain prefixes and bump version to 6.0.0 + bf173000d90a718d4a4c36fd1f8ceb5720ff87ac Fuzzing: Allow linking to other fuzzing engines + 88f30c3f5be38fb9cb6886a683a71ae792e61c61 Replace call to deprecated QNetworkReply::error method + 20befe6f00c84934a7ab9e9c27c8ac85cd0dac1d Don't use deprecated QMatrix class anymore + 84bc219fb1e9f586c1f7ac2c10172c4da2605f96 Add API to enable opt-in aspect ratio feature in QSvgRenderer + f48bf0293a682aef90e6e5b16cf5a9a06b7a32d2 Remove bearercloud example + 913fccee8a03e51665a16eb03979cbc5284a4b11 Revert "Replace call to deprecated QNetworkReply::error method" + aa42f80935314623865ba35693d73881f2a6157d Use Qt::SplitBehavior in preference to QString::SplitBehavior + 215a6642a48b1272a54ce2d125346fa0b8c89847 Remove overridden QSvgIOHandler::name() + 8dbfbe633ee7cd1853354830872fc1c60f9e2139 Fix build with recent qtbase Change-Id: I05055fd5563bf30d8e8df9960822766483a6318d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3Qt Forward Merge Bot2020-03-183-5/+8
|\ \ | |/ | | | | Change-Id: Ic4b8abc44f58b3d5d34cddf2743d0d172df4a374
| * Strip the quotes around the font familyAndy Shaw2020-03-103-5/+8
| | | | | | | | | | | | | | | | | | | | | | Due to changes in how QFont handles a family it should be given the whole string without quotes so it can find the family name correctly. Additionally, this changes it to use setFamilies instead of setFamily to make this more future-proof. Fixes: QTBUG-81926 Change-Id: I659950cf244c1f7a1a5dae6e7b0e136cfe274d47 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | 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
View Lorry Controller Status