summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3Qt Forward Merge Bot2019-04-131-0/+7
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I6be198d51f5e4c617724bd9c4098bd2bed45b995
| | * | Fix assert on misplaced tspan elementAllan Sandfeld Jensen2019-04-121-0/+7
| | |/ | | | | | | | | | | | | Change-Id: I75b3a88aae3cbd7838474d7a78f29fcd58172fc2 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-300-0/+0
|\ \ \ | |/ / | | | | | | Change-Id: I5ffdd97126b0f220a79f31825dd4071fdf30cd45
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2Qt Forward Merge Bot2019-03-270-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0b324787e01b6020604303de25fb135116d18319
| | * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | | | | | Change-Id: I9acd09c96dd99d9da58dec1df45e53163914be33
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-191-0/+20
|\ \ \ | |/ / | | | | | | Change-Id: I1560eb5661cdf15d6e7df8fc5dd5dc5fa8d7ba71
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
| |\ \ | | |/ | | | | | | Change-Id: Ia2d3f7a478105dd2fa0d74601779a16a4a116ce6
| | * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
| | |\ | | | | | | | | | | | | Change-Id: Ic3c621e86caa8d24bb328cb68a6734a88444efae
| | | * Add changes file for Qt 5.12.2v5.12.25.12.2Antti Kokko2019-02-211-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + ac797c4e17376b5497e0c37f15b9da48d622d18f Bump version + dcc4e2c4d96a6ad1447b9fb679afca21bb381218 Allow <style> without type attribute + a91a65632c4d830070e1ca9bbda7e355f1459414 Fix QSvgRenderer incorrect render of svg:image Change-Id: Ib13f61215098e8059b4b9168b04d61d1edd65617 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-123-13/+45
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I9449769798956561b0271bd9a3bcf4466b5c7fb2
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-03-093-13/+45
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I53ec3fb5c2aa7aa953628d2ef56fead24ce0160f
| | * | Fix IRI parsing, and use after freeAllan Sandfeld Jensen2019-03-043-13/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the parsing of IRI references tighter, and avoid freeing styles when inserting a duplicate id. Fixes: QTBUG-74104 Change-Id: I3a12fcf09ce1c55c135a4209817413ed8af75dec Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-052-5/+16
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I394d950125673f85e963e87bbaf6d2e6305a3ebb
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-022-5/+16
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I1c146c122f307cd6e985061b412ef2b50690561e
| | * | Fix heap overflow in path parsingAllan Sandfeld Jensen2019-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-74129 Change-Id: I871c144f1df288a310e82aef979af7cfd7a54095 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
| | * | Don't leak nodes on parsing failuresAllan Sandfeld Jensen2019-02-272-4/+15
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QSvgHandler always expects the caller to handle ownership of the generated document, also when the parsing failed. QSvgHandler also failed to handle misplaced group elements. Fixes: QTBUG-74083 Change-Id: I8907117d4305ecd84e328b201791001cb877fc60 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* | | Bump versionKari Oikarinen2019-02-251-1/+1
| | | | | | | | | | | | Change-Id: I70fb7fdfb3c5253604c1ec28ec67dfe44b2aabe7
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-127-22/+22
|\ \ \ | |/ / | | | | | | Change-Id: I4d21cbb25d9abfb792abad46b4b5c22151c3b084
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-093-11/+11
| |\ \ | | |/ | | | | | | Change-Id: Ieb656507bd67b147559c922ec0c7076e4b8b835a
| | * Fix QSvgRenderer incorrect render of svg:imageDavid Crémoux2019-02-063-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bounds of QSvgImage are integer based (QRect) which cause rounding issues when decimals values are used to define image (image shifted and with incorrect size). Changing the bounds to QRectF solves the issue. Fixes: QTBUG-73445 Change-Id: I49828e2c0b1917ec878844d520aac182581c23fb Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * | Fix deprecation warningsv5.13.0-alpha1Friedemann Kleint2019-02-054-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: qsvgiconengine.cpp: In member function ‘virtual QPixmap QSvgIconEngine::pixmap(const QSize&, QIcon::Mode, QIcon::State)’: qsvgiconengine.cpp:200:38: warning: ‘static bool QPixmapCache::find(const QString&, QPixmap&)’ is deprecated: Use bool find(const QString &, QPixmap *) instead [-Wdeprecated-declarations] tst_qsvgrenderer.cpp:479:54: warning: ‘const QMatrix& QPainter::worldMatrix() const’ is deprecated: Use worldTransform() instead [-Wdeprecated-declarations] ... glwidget.cpp: In member function ‘void GLWidget::draw()’: glwidget.cpp:231:41: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] glwidget.cpp:232:41: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] fluidlauncher.cpp:71:65: warning: ‘const QRect QDesktopWidget::screenGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] Change-Id: Iae20d950c3118d05f91202c8020dbd81fa73b48f Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-054-1/+19445
|\ \ \ | |/ / | | | | | | Change-Id: Ibbdc7db1f8390bce5f8d85134459b51b540b479b
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-024-1/+19445
| |\ \ |/ / / | | _ | | Change-Id: I4e35c67936df5609aa2329eab07ec2b126837af2
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-012-0/+19422
| |\ | | | | | | | | | Change-Id: I4b40124deaa859a56442bfd17568f8053368af82
| | * Add changes file for Qt 5.12.1v5.12.15.12.1Antti Kokko2019-01-101-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + a844c1c36551665f19be8a69c0e5e608d24f3a8e Bump version + ab492718dec3b54fce736b642dc6975d9b0046af Add changes file for Qt 5.11.3 + 601cfab349f57a765f174804e1d17769484c4fcb richtext example: Remove wince block as the platform is not supported + 1a66404fd0312a835da03a940894737c1bf77310 Consider relative path in image tags + 71556a32d9d48b1de03d7f248ecc8faff4f61878 Add binary compatibility file for QtSvg for Qt 5.12 + a308034012e6cbd35191edb710b721271ce1547a Bump version Change-Id: I5a602d36741ce950a4a7da6d94ab434418680bd5 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-082-1/+21
| | |\ | | | | | | | | | | | | Change-Id: I813d0a4fe85cfcf280551c60de5ca15422785e85
| | * | Add binary compatibility file for QtSvg for Qt 5.12Milla Pohjanheimo2018-12-181-0/+19402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Binary compatibility file added. Change-Id: I6661a0f32ce0c76d8a9d9b8ef6adcd4d89235ea7 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * | | Allow <style> without type attributeChih-Hsuan Yen2019-01-292-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://www.w3.org/TR/SVG/styling.html#StyleElement, `type` can be omitted. > If the attribute is not specified, then the style sheet language is assumed to be CSS. Original-Author: Christoph Feck Fixes: QTBUG-58326 Fixes: QTBUG-69378 Change-Id: Ic3d0e8db99da8c81e5a01c0dda33fb38428e38d5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I67c6c5a71432c36049ee2c5c9827b7151baa977c
| * | | Bump versionKari Oikarinen2019-01-141-1/+1
| | |/ | |/| | | | | | | Change-Id: Iec9f749299480a1393a408aebbc93571c2f661af
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7a90274afc370a8b0b20b9d5813e30ed812e956d
| * | Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | | | | | Change-Id: I327095a73f82a0c3f129e320032e98be22309d0e
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-251-0/+20
|\ \ \ | |/ / | | | | | | Change-Id: Iecd0e866b7c8f3bfc44ad51c2a53f7b9bbae15ae
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
| |\ \ | | |/ | |/| | | | Change-Id: I114745c9743d2d2ef75f27372c2e063d01f67c75
| | * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I0e134e70fe3035af72f44ad41fe751ab4f51db9c
| | | * Add changes file for Qt 5.11.3v5.11.35.11.3Antti Kokko2018-11-161-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + a844c1c36551665f19be8a69c0e5e608d24f3a8e Bump version Change-Id: Ie180062a4e928c90de1e50a2e32cade4cfabd464 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-111-0/+28
|\ \ \ | |/ / | | | | | | Change-Id: I73749df0817d0fc5af4050d4155e2c90c12ce81d
| * | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+28
| |\ \ | | | | | | | | | | | | Change-Id: I44e5a2f26e69e4a743512a199e582bc7c0c606a2
| | * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.05.12.0Antti Kokko2018-11-061-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If0b0c89402ffab373fdb68ceb6e6b94b40e19d03 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-046-5/+86
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I4221ef67f66bdf111a04978d1e8976339f8071af
| * | | Consider relative path in image tagsLars Schmertmann2018-11-306-5/+86
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16198 Change-Id: I26bf48cbac39af0fae490ed21579e8de326cd1a3 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-241-5/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I954cf9bf7322d7dd1ac14d67f611560f967b15fd
| * | | richtext example: Remove wince block as the platform is not supportedOliver Wolff2018-11-221-5/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id98f7cc5fb46bfc4ed57a78c86096b3d191967f5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-170-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ia2be466071d500192deb2f577d5571464dd7eabd
| * | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib767ec23fe87c9eb78928994a5e7d7aff65d278b
| | * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | Change-Id: Ie7e012de5b83843332bdfaf8314432345ddc6d1b
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: I6ff18faeaf7fc90a1ba408e5cc0ed52de4ed4bbf
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-223-3/+3
|\ \ \ | |/ / | | | | | | Change-Id: I6470dad844a85fb57cd24b54614b984bfd82859a
| * | BearerCloud example: Fix warning about hiding a virtual functionv5.12.0-beta4v5.12.0-beta3v5.12.0-beta2v5.12.0-beta1Friedemann Kleint2018-09-203-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Cloud::advance() to Cloud::advanceAnimation() to avoid a clash with void QGraphicsItem::advance(int). Task-number: QTBUG-60653 Change-Id: Iabcc0eab6de3090c5dcc0952f350b060ae542f02 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-151-0/+24
|\ \ \ | |/ / | | | | | | Change-Id: I5662f3f000f67aac1d1ef113be78a7239d847e19
View Lorry Controller Status