summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.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
| * | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
| |\ \ |/ / / | | _ | | Change-Id: If265ba140e908c1ca9fe484cc95d7078abad6d7f
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: I127df2b430d44c6e225e64e29ee40890ff9bdcbc
| | * Add changes file for Qt 5.11.2v5.11.25.11.2Antti Kokko2018-08-311-0/+24
| |/ | | | | | | | | Change-Id: I99858fea844d80ecb488c98a810e303e2b6146b6 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Fix parsing of forward referrals in use elementsEirik Aavitsland2018-08-204-20/+95
| | | | | | | | | | | | | | | | | | | | SVG <use> elements may refer to a node that is defined later in the file. The parser would then fail to resolve the link. Implement delayed link resolution in the parser to handle such cases. Task-number: QTBUG-69694 Change-Id: I94ffb3511dbd0fac822bb56991415b2d99ccf90e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Migrate QSvgHandler to use QRegularExpressionSamuel Gaist2018-08-121-11/+11
| | | | | | | | | | | | | | | | This patch updates the QSvgHandler class to use QRegularExpression in place of QRegExp which is to be considered deprecated. Change-Id: Ie35ff1e697741711440b6a99da26d435bc782d15 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-312-5/+32
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic41094e6744df3d84d76bcfe701092e137660f80
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: I7de0227d57c10959d4b898ca0757c9608678fed2
| * Fix crash when parsing malformed url referenceEirik Aavitsland2018-07-302-5/+32
| | | | | | | | | | | | | | The parsing did not check for end of input. Change-Id: I56a478877d242146395977b767511425d2b8ced1 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix transformation of gradients for svg objectBoundingBox coordinatesEirik Aavitsland2018-06-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | QBrush transformations were not applied in the object coordinate space, even when using Qt's ObjectBoundingMode. Use the new ObjectMode instead to fix this. Task-number: QTBUG-59978 Task-number: QTBUG-67995 Change-Id: I79f529853ed8bca86b1811f4edf66244a026a27c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-232-39/+24
|\ \ | |/ | | | | Change-Id: I1d939396e8dbc3d08cc6f1b0817619c3abb60ede
| * Remove dead test - compilerwarningsLiang Qi2018-06-221-39/+0
| | | | | | | | | | | | | | A follow-up of 9d078c8f147ea875e862360b0d7480201fbbcff7 in qtqa repo. Change-Id: Iefdd437266d3c8df0d8814d13ec660aa9cba463a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | Change-Id: If229fa4d320d4a7c3981bc7ce89fb09d3e4cdd00
| | * Add changes file for Qt 5.11.1v5.11.15.11.1Antti Kokko2018-06-121-0/+24
| |/ | | | | | | | | Change-Id: I522e79e365cc07f5e41f26f2fc14cd40ee3ea18f Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-121-0/+19337
|\ \ | |/ | | | | Change-Id: I818b1c4460e6269a780a4cc71efeb6b58106c479
| * Add binary compatibility file for 5.11 for QtSvgMilla Pohjanheimo2018-06-051-0/+19337
| | | | | | | | | | | | | | Binary compatibility file for bic test added. Change-Id: I78878fa96a9c8bc6960076d4350fa03802911a9b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Make svg icons work as pixmap iconsThorbjørn Martsum2018-06-111-25/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes the svg icon code similar to the code for pixmap icons. We only style the code if we fetch a different mode (+it is not normal) and we try to find icons in same order as the pixmap icons. [ChangeLog][][QIcon/QSvgIconEngine] Made SVG icons behave like pixmap icons: An explicitly-set disabled icon is no longer additionally grayed out. Task-number: QTBUG-67452 Change-Id: I94b4146bae2e9d924a96b602bf23909bd7f0e934 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Morten Kristensen <msk@nullpointer.dk> Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-042-0/+48
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iafb0b9bc6f3779e9e84e8c93d454534685741d0f
| * Add changes file for Qt 5.9.6Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | | | Change-Id: Ie6352b9093a34bfb3bbc4a0b8a44d06cb5e725a7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 7a28db8f5bc0149eee67479c1e58d20a7a02be73) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Add changes file for Qt 5.9.5Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | | | Change-Id: I1d033fd614b1acaba93066930d5bb11dabfa030b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit dec74295e8d378e7827c53c0ca665516cc22b013) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: Ic94fdd1effff541a35b0a81ef6561d0a450b4261
* | Remove LGPL_EXCEPTION.txtEdward Welbourne2018-05-311-22/+0
| | | | | | | | | | | | | | | | It became obsolete when we switched to LGPL3, as discussed on the developer mailing list in April 2017. Change-Id: I47c5ac515694ecd0cb07d11dd8db570b43b6f9b7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
View Lorry Controller Status