summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
* | 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.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>
* | SVG image handler: catch and warn about QImage allocation failureEirik Aavitsland2018-05-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | QImage allocation failure, typically because of out-of-range dimensions, was not immediately caught and reported. This could lead confusing error messages as QPainter would render on a null image. Task-number: QTBUG-68229 Change-Id: If99033244728f1cea635691c6a93564976962f09 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+22
|\ \ | |/ | | | | Change-Id: Ia4ec2a0dde874781c46083513a0c31012f8643c8
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
| |\ | | | | | | | | | Change-Id: I4da15d967a8fff399f22b0bb288d4a54a7fc420c
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.05.11.0Antti Kokko2018-04-231-0/+22
| | | | | | | | | | | | | | | Change-Id: Ie4291b3ef0b56ba7606ce00c1bc6f64764b20487 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-014-3/+24
|\ \ \ | |/ / | | | | | | Change-Id: I0896068c2364ef73b2dc5656dd5291a5bd4fc48d
| * | Interpret width or height specified in percent as relative to viewportFrederik Christiani2018-04-304-3/+24
| |/ | | | | | | | | | | | | | | | | | | | | When width or height is specified in percent, it is supposed to be relative to the viewport. https://www.w3.org/TR/SVG/coords.html#Units Task-number: QTBUG-2279 Change-Id: Ia1597b88d4e1c705a6755db788a18cf790d5ee97 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-141-1/+1
|\ \ | |/ | | | | Change-Id: I4a918e843958b557216e7156ee2b6c5087941417
| * Fix rotate animation freezing in wrong positionv5.11.0-beta4Friedemann Kleint2018-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | In QSvgAnimateTransform::resolveMatrix(), the indexes into the vals array were previously calculated to be 1,1 in the final step, where currentPosition=1, by using qCeil()/qFloor(), resulting in rotationDiff=0 and the rotation snapping back. Fix by setting startElem to endElem - 1 when available. Task-number: QTBUG-67525 Change-Id: Ie1d7e8be6ea8dd9aa155ee8c479037bc269f6df7 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-064-2/+67
|\ \ | |/ | | | | Change-Id: I22feba1b24694d117e56999b6c940663d0957759
| * SVG viewer example: Improve zoom facilityv5.11.0-beta3v5.11.0-beta2Friedemann Kleint2018-03-014-2/+67
| | | | | | | | | | | | | | | | | | | | | | Add a label displaying the current zoom with a tooltip. Add menu actions for ZoomIn/ZoomOut and Reset. Task-number: QTBUG-60653 Change-Id: I7569427345737024b7a3191677e54c83673bb40e Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-274-87/+134
|\ \ | |/ | | | | Change-Id: Ic2b1b60b29f756fc5c82517ac108c5583d8bdf0b
| * QSvgHandler: Change some usages of QString to QStringRefFriedemann Kleint2018-02-271-57/+54
| | | | | | | | | | | | | | | | QString allocation can be avoided in some places after the introduction of QStringRef::toInt()/toDouble(). Change-Id: Ib400f49df04847f85aeea0190215f864f71223bd Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Fix warning when encountering font-size="none"Friedemann Kleint2018-02-271-27/+51
| | | | | | | | | | | | | | | | | | | | Extend existing enum by "none" and extract a function to return the specification so that "none" can be cleanly handled. Task-number: QTBUG-66646 Change-Id: If4ec1056c6f0fa407f76b747634bb898e75a5474 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta1Liang Qi2018-02-180-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If31f1430d1beb9d99a525bcc8bfa5153e3eea6e2
| | * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | | | | | Change-Id: If833630769eed7bdb4a09c92bbd5ec58bfd3a29f
| * | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
| |\ \ | | | | | | | | | | | | Change-Id: I272dfbe4b2cd91511d44f8e3af200a579507cdd7
| | * | Add changes file for Qt 5.10.1v5.10.15.10.1Antti Kokko2018-02-051-0/+26
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie7f6640d389672c478a11fd9266a427c07d2b4bb Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * | | Fix typosJarek Kobus2018-02-131-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I14e42b9f55f80e7f2098ba9fcb3c9c47a81446ab Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | | Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-121-1/+1
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ic852de844e8a1e7acfe4aaaf79acf46674ba5ffa
| | * | MSVC: Don't set a DLL base address for 64-bit5.10Thiago Macieira2018-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linker complains: LINK : warning LNK4281: undesirable base address 0x67000000 for x64 image; set base address above 4GB for best ASLR optimization And it's not really required anymore, as the recommended /DYNAMICBASE is the default. Change-Id: I56b444f9d6274221a3b7fffd150caab1beecfd43 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | Bump versionOswald Buddenhagen2018-02-191-1/+1
|/ / / | | | | | | | | | Change-Id: I65c8efade4db7e775cf78eaf175840aaaa173e80
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-204-1/+19373
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2d1692e18205aa86e7181d907eac21dc096744ae
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-181-0/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5a4e51446414fc6447f478d8c3d8da2a071fb965
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| | |\ | | | | | | | | | | | | Change-Id: Id4a0cda25cfd44b4d34d6d7fdad3ceb0c9e05bc2
| | | * Add changes file for Qt 5.9.4v5.9.45.9.4Antti Kokko2018-01-081-0/+25
| | |/ | | | | | | | | | | | | | | | Change-Id: If222d9f7e68bc17474bf99e973668cab10facb52 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: I393c717f0973c53761ff2fa464b4ba49f8a2cf52
View Lorry Controller Status