summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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>
| | | * 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>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I6129c6fd8da34ab3c10bca0e88c57fad1cadc458 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Icc3802383e672b82625ad3b97a7e7489942feb0e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-121-0/+20
| |\ \ \ | | |/ / | | | | | | | | Change-Id: If5595a3a429097fae2ed3d417eab82f9866a4a7b
| | * | 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
| * | | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibded15f1ca85264255e1fa1c9af9262c177dde36 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ab2d1dfc16dd59cb7fe61b48f133d7ad76662ce Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I89959b45a101ff186a2c0b801dfee14461aa7edb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaf1d775b6075c49d030ef10fd44f37c924e601cb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6cfb430ac13627dd9d8d879303e1771bb1e7b87f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I66fcfab359675af5f12c8328c8e42b9025b17958 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8caf4d0f2de5afd246f900ad77b164b8e031fd65 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0b5e934d5bfa2a1e135ba002bf728c3ee383f9a5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2ae74a73f2fc7af86dea0cfe7a101e3ff925ccf7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I42ef0963df93047a4e287849366a1c77faee59f7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7867b0cd855c1cd8f57c2b4e09384e658bf3b7d6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8c57295adea3917d357b49394bc3025038f219bd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifadcb649bf59ecbca63b0a677044070d2d1818cf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8f9c5344aa4fd0003aac4ef131698b974dc195d3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2019-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I741d216da6321339f5cd3c6932fa19efb2f8b581 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | cmake: add Android buildLiang Qi2020-02-071-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-78945 Change-Id: I5a5f24f3c073f39f06f0ac1242c8a61a9fe64204 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | | | Fix standalone tests buildsLeander Beernaert2020-01-061-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align with de3a806def4b9a754825a2233c9d4952a9b2d0eb in qtbase. Change-Id: I7418cd1cdb946e3ebc06c97c3aa41cf219d615d6 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | | Regenerate projectsAlexandru Croitor2019-11-1511-48/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie5198bc76688e40170a8b0a401435f97898bb818 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-1511-9/+19821
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Removed dependencies.yaml. Change-Id: I4a0c5c1be5781ee521e9b54d720d27f386870324
View Lorry Controller Status