summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix crash when parsing malformed url reference5.6Eirik Aavitsland2018-08-092-5/+32
| | | | | | | | | The parsing did not check for end of input. Change-Id: I56a478877d242146395977b767511425d2b8ced1 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 8c199714e9bc638fb3f6ec747fb7a23373e49335) (cherry picked from commit 97eebc52a8362f8b841e24ad0e4d54315d1948e3)
* Fix crash on recursive self-referral in <use> elementEirik Aavitsland2017-11-225-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> (cherry picked from commit 18a2adad907523ea31251ff0b62e3321241a40fa)
* Bump versionOswald Buddenhagen2017-09-211-1/+1
| | | | Change-Id: Ia20171c6be11c981c4713dad1341b484609f45cc
* Fix svg generation for non-normalized rectanglesv5.6.35.6.3Eirik Aavitsland2017-08-151-1/+1
| | | | | | | | | | | The raster engine accepts and renders non-normalized rectangles. Make the svg paint engine do the same, instead of just ignoring them. Task-number: QTBUG-58145 Change-Id: Ifa82fd580574bc908552efbb1eeace21bde76ed7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 8ea914c667e3d021d6618915e694a4d8bed5fe9f) Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* QSvgIconEngine: Paint correct size if device pixel ratio is fractionalBłażej Szczygieł2017-03-281-1/+1
| | | | | | | | | Use method which returns qreal. It is available since Qt 5.6. Task-number: QTBUG-59729 Change-Id: Ifc1a101c8dd837597c35ce14f0314218d2882501 (cherry picked from commit 02ed4c65618b0f27b9ccb6867ab4d633612415c8) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Bump versionOswald Buddenhagen2016-11-281-1/+1
| | | | Change-Id: I6a7d0f50f8ac78542e3c991377c0f30dd4c2a370
* Use separate metadata files for plugins if QT_NO_COMPRESS is definedAlexander Volkov2016-11-105-0/+16
| | | | | | | Change-Id: Ib15aa96c2ed84cf3ce9793385476f9fb3cacec8c Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Imageformat plugin: Add mime type "image/svg+xml-compressed"Alexander Volkov2016-11-101-1/+1
| | | | | | Change-Id: I3cf5d9b6d6212128adab4682de33b192672f7c1f Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* remove dependencies from sync.profileOswald Buddenhagen2016-11-061-10/+0
| | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: Ib4d20a382925262109c5d5f63372d767af188aba Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Ignore .svgz images unless compression is enabledAlexander Volkov2016-10-272-2/+15
| | | | | | | | | The imageformats plugin was trying to pass them off to QSvgRenderer, which can't handle them when QT_NO_COMPRESS is defined. Change-Id: I92241370d8fd4ed2328fb13a01306fa8a7e5ef6e Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Fix UB (signed overflow) in QSvgIconEnginePrivate::pmcKey()Marc Mutz2016-09-091-1/+1
| | | | | | | | | | | | | | Found by UBsan: qsvgiconengine.cpp:64:84: runtime error: left shift of 537133056 by 4 places cannot be represented in type 'int' Fix by casting to qint64 at the start of the shift-or chain. The total cumulative shift is by 28 places, so 64 bits should be enough to not overflow anymore. Change-Id: Ia37bc98c5af67a4de10fb9807addd369110f36d2 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* BC data files for QtSvg for Qt 5.6Milla Pohjanheimo2016-09-051-0/+18524
| | | | | | | | Added binary compatibility data files for tst_bic test Change-Id: I8e7191e157085d94a2f6ea1bf9643cdd04099e3c Reviewed-by: Sergio Ahumada <sahumada@texla.cl> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Allow running qicon_svg test against local qtsvg buildv5.6.25.6.2Dmitry Shachnev2016-07-121-2/+1
| | | | | | | | | | | | | | | When the build is local (i.e. not system-wide installed), libQt5Svg.so.5 needs to be on LD_LIBRARY_PATH, otherwise the plugin will not be able to load it. LD_LIBRARY_PATH is set by target_wrapper.sh, generated by qmake, which will add local lib directory there only if QT contains svg. This is a workaround for the dependency resolution of plugins and modules not being properly integrated. Change-Id: I68c3bc850367af62e7ccaa766fa83453fa0d8621 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-173-3/+3
| | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I9f35d9b9c1ca8b6e5d41ef97df6974842ef0d767 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* QSvgAnimate{Color,Transform}: initialize all members.Edward Welbourne2016-05-312-8/+17
| | | | | | | | | | | | | | Coverity (CIDs 22640, 22316) complained that some members weren't initialized. Although setters are provided for these members, we have no guarantee that they're called, so initialize to sensible values. Chose indefinite repeat (repeat count -1) rather than single-shot. In the process, discovered each class's m_to was used only in the constructor (my initial change removed even this use, leading to a compiler warning, as error, on OSX); so removed from both classes. Change-Id: Ibb88a6190f2d740f57c67c1d5ee8a7b03129c510 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+0
| | | | | | | it's done centrally now. Change-Id: I457d86a8815aa7ab7275515c692c457ac6f4177e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-05-191-1/+1
|\ | | | | | | Change-Id: I603566cf4d54826b61dc4adcea85bbb94c0c9be6
| * Doc: Remove repository name from examplesinstallpathv5.6.1-1v5.6.15.6.1Topi Reinio2016-05-121-1/+1
| | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: I15cc16953efdfb3e327de82e3f6c412941811853 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | Change-Id: Ia81f26370c94b6cbcf6a4ca284e2eed82f7cb475
* | Fix QSvgIconEngine fallback to try icon with same state firstJoni Poikelin2016-05-121-2/+7
|/ | | | | | | | | | If icon is not explicitly set, QSvgIconEngine always took Normal Off icon. Task-number: QTBUG-53328 Change-Id: I404206b0244d0009f7be1f520c2e84c0b7cd3e71 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* purge symbian vestigeOswald Buddenhagen2016-04-281-8/+0
| | | | | Change-Id: Ic1bc43b92a8c211ecadf1f2988fbb33779a27c08 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* delete .desktop files of examplesOswald Buddenhagen2016-04-283-33/+0
| | | | | | | | | they were added without an explanation, and they can't be particularly useful (because they contain hard-coded paths and refer to non-existing icons). Change-Id: I5f0bb2efbdfa296c07a65afacac5fb1d80490037 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* remove unreferenced svg filesOswald Buddenhagen2016-04-282-167/+0
| | | | | Change-Id: I97d904adb62eda37b0d40a1b33ea62aa9f66f5ff Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* qtsvg.qdocconf: Fix plugin paths.Friedemann Kleint2016-04-191-2/+4
| | | | | | | | | Fix qdoc warnings: ../qtsvg/src/svg/doc/qtsvg.qdocconf:33: warning: Cannot find file or directory: ../../plugins/svg ../qtsvg/src/svg/doc/qtsvg.qdocconf:36: warning: Cannot find file or directory: ../../plugins/svg Change-Id: I6a085c539bd0244184e5b9a53878fb1e0144bd4c Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* Handle PdmDevicePixelRatioScaled metricSune Vuorela2016-04-131-0/+1
| | | | | | | Quiets a warning about an unhandled member. Change-Id: I20f6b6849176df541fba2e1a75d1d4ee8f2df303 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-221-0/+0
| | | | | | | | Subjects a *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I457007c527201705b63e0ef758fcf597a5942895 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* examples: Only deploy on wince*Heiko Becker2016-03-211-3/+5
| | | | | | | | Otherwise heart.svg is installed two times - one time in a strange location. Change-Id: Iacd0c7342f323dd600e0539e399efe4d1d9e5665 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-023-9/+9
| | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Task-number: QTBUG-45291 Change-Id: I725682ffe00dab94f84b00eed3aa76377bb80519 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-253-11/+12
| | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I20b0d2c018e3adce10629aee3fa055df437df71c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Bump versionOswald Buddenhagen2016-02-081-1/+1
| | | | Change-Id: I9c04cb78c2f7ad2a0a3a729c8b9d27e0ba48b39d
* Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-rc1v5.6.05.6.0Liang Qi2016-01-191-1/+4
|\ | | | | | | Change-Id: I600bace05d6bc88a9f69962698512127d4a4bb4e
| * Support custom ZLIB library name(s)5.5Mike Gelfand2016-01-151-1/+4
| | | | | | | | | | | | | | | | This is already the case for qtbase and qtwebkit, while here only hard-coded "zdll.lib" was used on Windows. Change-Id: I83a86e17ebd0ed6ae4ef47925b3fdaf38984617c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Improve format detection in the image reader pluginv5.6.0-beta1Eirik Aavitsland2015-11-203-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | canRead() would reject a file starting with an xml comment. canRead() by design accepts anything that looks like the start of an xml file, and the comment token "<!--" should be an indicator as good as any of an xml file. Task-number: QTBUG-49496 Change-Id: Id3c17f6b02344fa6a20bc2a839e345e5cebc14c2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | make use of the new QtZlib moduleOswald Buddenhagen2015-11-181-4/+1
| | | | | | | | | | Change-Id: If4d760f369c34301778a13a68bbd03079a479a80 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-281-0/+1
|\ \ | |/ | | | | Change-Id: I4e901d3337a82cf07a0ac9aa56ed02a400d6905d
| * Add missing string for tspanAndy Shaw2015-10-201-0/+1
| | | | | | | | | | | | | | | | | | The node name list needs to be kept in sync with the QSvgNode::Type enum otherwise it will match the wrong name for the wrong value after the missing entry. Change-Id: Ib13025bc3c5f31ff4f76638d05d1419ad091622b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix the install path with the repository name. Task-number: QTBUG-48736 Change-Id: I5767e7e8a91e4da1be162693d33a8d2eafc6144f Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-020-0/+0
|\ \ | |/ | | | | Change-Id: I101ec4741b844352509ee3003b173b92fefb05ba
| * Doc: removed System Tray exampleNico Vertriest2015-09-153-183/+0
| | | | | | | | | | | | | | | | System Tray example now resides in qtbase Task-number: QTBUG-47201 Change-Id: I6f799b89c992ce53f742e0ac36abff91f2ce3a83 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Remove systray.qdoc and images.Friedemann Kleint2015-09-103-183/+0
| | | | | | | | | | | | | | | | | | The system tray example initially was in QtSvg after the Qt 5 modularization split since it depended on it. In the meantime, it has been moved back to qtbase. Change-Id: I6337ba71d5f53680ead7db4a52049407c88275cf Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1Liang Qi2015-08-212-0/+688
|\ \ | |/ | | | | Change-Id: I42feb5c90d477b79bf98c534dd151984a12be8bb
| * Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.15.5.1Liang Qi2015-08-190-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3c55edb069f94a9a48cf036c226d9b7263980d1c
| | * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | | | | | | | | | | | Change-Id: Id461792979bca34385b8ca33a0d74d69d0faf5f2
| * | Add the GPLv3 license textThiago Macieira2015-08-132-0/+688
| | | | | | | | | | | | | | | | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-090-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iedb8d143caac26003fd3f9a74d1f27d87414591d
| * | Bump versionOswald Buddenhagen2015-06-291-1/+1
| | | | | | | | | | | | Change-Id: I671e3f17e11af7f2c25ca4646b28fda65a22cd64
* | | Fix Qt svg build for WEC2013Bjoern Breitmeyer2015-08-041-0/+4
| | | | | | | | | | | | | | | Change-Id: I2fb05270eb946536c50938f40bc54853acc84e98 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | | Add a couple of QList::reserve() calls.Sergio Martins2015-06-081-0/+2
| | | | | | | | | | | | | | | Change-Id: Ife2fa97ef8395753523aba96757fac8885a75980 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | Fix users of QTextLayout::additionalFormats to use the new APIMarc Mutz2015-06-011-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextLayout::additionalFormats setters and getters using QList<FormatRange> have been deprecated; port to the QVector versions. Also perform two drive-by optimizations: using resize() instead of push_back() to append default-constructed elements (saving one or two copy ctor calls). Change-Id: I8b6d424f9d3ba2eb0f12098f92bb7bee11ab6d76 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-05-113-13/+10
|\ \ \ | |/ / | | | | | | Change-Id: I5c6805b48d62c913ed6e8e1e0efb20013b34cba6
View Lorry Controller Status