summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
| * | svgiconengine: Fix isNull() for deserialized iconsPalo Kisa2018-01-102-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 4a9470e55ce08752501868c60762268fdf2c44af there was introduced specific isNull() implementation for QSvgIconEngine. But the existing check was not sufficient for the scenarios where the QIcon is constructed by deserialization from QDataStream (from previously serialized valid svg QIcon). We also need to check the svgBuffers as the previously serialized svgFiles are silently ignored by QSvgIconEngine::read(). Change-Id: Id64ce233baead053c8b5ca61f1d416e46a8c6088 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: David Edmundson <davidedmundson@kde.org>
| * | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | Change-Id: I724ce4bf4a12dafff0d7240217ccc8fc4fe50a22
| * | Add binary compatibility file for QtSvg for 5.10Milla Pohjanheimo2017-12-141-0/+19337
| | | | | | | | | | | | | | | | | | | | | File to test binary compatibility for QtSvg for 5.10 added Change-Id: I5333ee7c5ab7bc13e131d7b9db7f13c8c652fe78 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | Port away from QRegion::rects()Marc Mutz2017-12-051-2/+1
| | | | | | | | | | | | | | | | | | | | | Use begin()/end() instead. Change-Id: Ia51069dba42aa26e78b071b147a69c7f36947d12 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2057-194/+572
|\ \ \ | |/ / | | | | | | Change-Id: I7e158268343c5d92d666d266a87095f1154714dd
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.05.10.0Liang Qi2017-11-155-2/+32
| |\ \ | | |/ | | | | | | Change-Id: I2c5f1f592e2141b93fa274124a96f2a63b83acdb
| | * Fix crash on recursive self-referral in <use> elementEirik Aavitsland2017-11-155-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Referring to an ancestor in a <use> element would lead to endless recursion. Add checks to avoid recursion, and also emit a warning while parsing. Task-number: QTBUG-64425 Change-Id: I9ee1b9bfef13796cc3f387ff8579c6b13bc4ae9a Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * | Update to new QRandomGenerator APIv5.10.0-beta4Thiago Macieira2017-11-031-1/+1
| | | | | | | | | | | | | | | Change-Id: I69f37f9304f24709a823fffd14e676c097712329 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-3054-191/+539
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8b9a5a395dbd6659f7806eeebdd665c760a71ec1
| | * Fix outdated FDL license headerv5.9.35.9.3Kai Koehne2017-10-1713-65/+65
| | | | | | | | | | | | | | | Change-Id: I2a2501a61107717b8e1adacad064664cf54cd972 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Fix outdated BSD license headerKai Koehne2017-10-1736-108/+468
| | | | | | | | | | | | | | | Change-Id: I3917e7ab180b49c77bff0d071eca10f8bc7f33c7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Avoid possible detachingAndré Klitzing2017-10-101-2/+2
| | | | | | | | | | | | | | | Change-Id: Iea5521d1fd53d5af21f99023f8d9ed15ef2f4f68 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | Change-Id: Ieb6391b41349f00e103b63f88f03fbf277be16c4
| | * Remove unused variablesAndré Klitzing2017-10-062-11/+0
| | | | | | | | | | | | | | | | | | Change-Id: I82fe38e2fbcc070d02d2acb34a43a8c971e84ae9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * Add missing emitAndré Klitzing2017-10-061-1/+1
| | | | | | | | | | | | | | | Change-Id: I2a3c0a3734548919d8a337b88b9aa6fdf725bbc1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Return correct PdmDevicePixelRatioScaled metricAles Erjavec2017-10-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSvgGenerator::metric returned incorrect value for `PdmDevicePixelRatioScaled` resulting in degenerate `devicePixelRatioF()` return value. [ChangeLog][][QSvgGenerator] Report correct devicePixelRatioF Task-number: QTBUG-63159 Change-Id: Ib45e930b6b1b6d85aea5a68dd2b1b5f16a4eed3b Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * Remove inaccurate statement about using setSize() from the documentationv5.9.25.9.2Andy Shaw2017-08-231-3/+1
| | | | | | | | | | | | | | | Change-Id: I9a18a0cfc86411336cbf29e0b7fb2f77f704d284 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-273-9/+9
| | | | | | | | | | | | | | | Change-Id: Ibaae1afa39414a951a57c36037fa3b951654329f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Bump versionFrederik Gladhorn2017-09-041-1/+1
|/ / | | | | | | Change-Id: Ia0f35da3ff61512aa8e86ca67360ea3ea0dce1bf
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1Liang Qi2017-08-154-4/+19049
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1ebd40264cf1afaf5bcbf8b2f272e153f51a5625
| * Fix matrix multiplication in parseTransformationMatrix()Christoph Stein2017-07-031-3/+3
| | | | | | | | | | | | | | | | | | Sequencing of a matrix multiplication seems to be erroneous, this may lead to incorrect svg rendering under certain circumstances Task-number: QTBUG-61568 Change-Id: Id8b6c425d4affde8c71faad455a63a87ef5e13a4 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-301-0/+28
| |\ | | | | | | | | | Change-Id: I7c7d4acc19ccf05cfafd0822f7394d70089f613b
| | * Add changes file for 5.9.1v5.9.15.9.1Jani Heikkinen2017-06-201-0/+28
| | | | | | | | | | | | | | | Change-Id: I39d061455bff2c21096d1bf5ebb66e44c5a097f6 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * | Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | | | | | Change-Id: I50f90ab6f2fa774729429eb2c0f5da2f6fb4b442
| * | Update binary compatibility files for Qt5.9.0 for QtSvgMilla Pohjanheimo2017-06-301-0/+19016
| | | | | | | | | | | | | | | | | | | | | Binary compatibility files updated for Qt 5.9.0. Change-Id: Id7bdd7620ea8081616aea223e5bc423e454de305 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * | Do not reallocate memory for QImageAllan Sandfeld Jensen2017-06-201-1/+2
| |/ | | | | | | | | | | | | | | | | | | If the QImage given to read() already has the right size and depth, we don't need to allocate a new image. This is consistent with other image decoders and why a QImage is provided to the method in the first place. Change-Id: I4944211d4a8d4f19d000cace4a48df505d375f52 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Replace a float[128][128] with a single floatEdward Welbourne2017-07-141-3/+4
| | | | | | | | | | | | | | | | | | The whole array was incremented in lock-step so that, when values were being read, they all had the same value; so a single float can hold that value, instead of 16k copies of it. Change-Id: Ib1bd31513eb7fe9e500f16f37a1c3653426c896c Reviewed-by: hjk <hjk@qt.io>
* | Be (somewhat more) consistent about the value of piEdward Welbourne2017-07-142-26/+14
| | | | | | | | | | | | | | | | | | Use M_PI (from qmath.h) rather than hand-rolled values. Simplify some untidy arithmetic, eliminating some duplication and inefficiency. Task-number: QTBUG-58083 Change-Id: I6ec5a91cae30693e0c17f80e2be235faa1edcdb7 Reviewed-by: hjk <hjk@qt.io>
* | Use QRandomGenerator instead of q?randThiago Macieira2017-06-302-6/+5
| | | | | | | | | | Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix table-row-group in displayStringToEnumRobert Loehning2017-06-071-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-60583 Change-Id: I685d4d68663703e220150869dff671718a8190a1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-072-6/+41
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Idf7f59a8c4b78438b496f2c16ba9ce48573042e9
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+36
| |\ | | | | | | | | | Change-Id: Ib8c47b9265bcaa02bd536a07eafe5196f6e6dfc1
| | * Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.05.9.0Jani Heikkinen2017-05-081-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: I339c7241126f9094787e76deebd82b4ed79832e7 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Błażej Szczygieł <spaz16@wp.pl> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * | Correctly parse the stroke-dasharray attributesAndy Shaw2017-05-301-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a stroke-dasharray had multiple values separated by spaces it would end up combining them into one instead of treating them separately. This ensures that it is correctly respected. [ChangeLog] Parses the stroke-dasharray attributes in a SVG file correctly. Change-Id: If6e9babe9f63637e56d3d1dba914557829f9d5f0 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * | Bump versionOswald Buddenhagen2017-05-101-1/+1
| |/ | | | | | | Change-Id: I323e6b2ebd716c439c65587f0029e9fae768670e
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-2115-100/+19225
|\ \ | |/ | | | | Change-Id: I855627bf0387be820d97bbc0226fed07fd1db64a
| * Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta4v5.9.0-beta3Liang Qi2017-04-181-1/+1
| |\ | | | | | | | | | Change-Id: I4b41cae71f5a5f734a7e3bb8b95130b0cb35e0ac
| | * QSvgIconEngine: Paint correct size if device pixel ratio is fractional5.8Błażej Szczygieł2017-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use method which returns qreal. It is available since Qt 5.6. Task-number: QTBUG-59729 Change-Id: Ifc1a101c8dd837597c35ce14f0314218d2882501 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Fix warnings for -no-feature-cssparserv5.9.0-beta2v5.9.0-beta1Nikita Krupenko2017-03-291-2/+4
| | | | | | | | | | | | | | | Change-Id: Ifdb27c6fed26f95acff30f64259d6905e88c3a6f Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>