summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-12-1712-737/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the framebufferobject example as it still relied on the now removed QGL* classes. Ported the svgviewer example over to use QOpenGLWidget. Change-Id: Idfb1ea7bcb0c8ba7f3f97b4b2d26603f4f7ec96a Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-171-0/+22
|\ \ \ | |/ / | | | | | | Change-Id: Id35eb26777ca0393c4e9442917b92f3fc64d08c9
| * | 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>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-100-0/+0
|\ \ \ | |/ / | | | | | | Change-Id: Ibb75928176da36784ecc1132e600b815b1695fbb
| * | 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>
* | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-12-101-1/+1
| | | | | | | | | | | | | | | Change-Id: I0cad3020b8980de2a449d87c295de1bfeb80b546 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-12-091-1/+1
| | | | | | | | | | | | | | | Change-Id: I4eca329d6ec25f6301f9039253e8329d3382f02a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-12-051-1/+1
| | | | | | | | | | | | | | | Change-Id: I61d71960cc75396df8dc3032fc4e2e84203ffd6c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-12-041-1/+1
| | | | | | | | | | | | | | | Change-Id: I7df32a06797ed23021c508a44c2f25d04cfaf70b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-11-291-1/+1
| | | | | | | | | | | | | | | Change-Id: Id028aa52c59f0fa051e18cbeeeabe6b1c4061a35 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-11-281-1/+1
| | | | | | | | | | | | | | | Change-Id: I632ec5544ea898ce1ad2e218ce1d251c24e73780 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-11-261-1/+1
| | | | | | | | | | | | | | | Change-Id: I96c00cea562da9e8f7ed2f1b0d63117e9e647456 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-262-5/+4
|\ \ \ | |/ / | | | | | | Change-Id: I24a15a5df1d8dc088c63da74cb5c1cdcf6cad411
| * | 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>
* | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-11-251-1/+1
| | | | | | | | | | | | | | | Change-Id: I203f31f200d1f227fbd5ee8fbb27d742401264ff Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-11-211-1/+1
| | | | | | | | | | | | | | | Change-Id: I1b87dd2d2f4ca5dab339133d2fbd4e756bab6814 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-193-9/+46
|\ \ \ | |/ / | | | | | | Change-Id: I9bcff36d9cefb01ab8b3214139a70194a5ea31fe
| * | 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>
View Lorry Controller Status