summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Updated license headersJani Heikkinen2016-01-2532-448/+640
| | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I4bbd8b2a35222b925c6e5cef6337e6237d3e1716 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* QSvgGenerator: POD function param should be passed by valueAnton Kudryavtsev2016-01-181-1/+1
| | | | | Change-Id: Ic6430f00198baec15a51c37c8c8ff01bd7014b8b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Replace foreach with range-based forAnton Kudryavtsev2016-01-182-4/+4
| | | | | | Change-Id: Ie4d5aac39958b8e1fe946d61679a98fdc21c7b0b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* QSvgIconEngine: fix expensive iteration over QHash::keys()Anton Kudryavtsev2016-01-131-5/+5
| | | | | Change-Id: I5bb1c630eff9d484098fcade5da6b1ed3680bc27 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* QSvgIconEngine: fix build with QT_NO_COMPRESSAnton Kudryavtsev2015-12-071-1/+2
| | | | | Change-Id: Ic899f7ac59f11d84d76101f8221051a7d94fdd9a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* 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-111-9/+9
|\ | | | | | | Change-Id: I5c6805b48d62c913ed6e8e1e0efb20013b34cba6
| * Fix inconsistent overrides. [-Winconsistent-missing-override]v5.5.0-rc1v5.5.0-beta1v5.5.05.5.0Sergio Martins2015-03-221-9/+9
| | | | | | | | | | Change-Id: I3f5af4d3355f790ef17715fc0617c66b78ee78d0 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-03-171-1/+2
|\ \ | |/ | | | | Change-Id: Ib10578aaf1e3be931a19e266d4a18a094b3e4728
| * Imageformat plugin: Set mime type "image/svg+xml"Alessandro Portale2015-03-171-1/+2
| | | | | | | | | | | | | | | | QImageWriter::supportedMimeTypes() is missing "image/svg+xml", because it was missing in svg.json. Change-Id: Ica006e2a9e921deed5469c58f939b585dbf8c4ea Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-03-032-4/+7
|\ \ | |/ | | | | Change-Id: Idaa606177bbdd5b078d04d5e9916d319bf00b66b
| * Stop using PREMUL and INV_PREMUL macrosv5.5.0-alpha1Allan Sandfeld Jensen2015-02-241-3/+3
| | | | | | | | | | | | | | | | The two macros were replaced with qPremultiply and qUnpremultiply in Qt 5.3, and this is the last place in Qt the old macros are still used. Change-Id: Ic1bd1f37a843ffa76e37adfcbbde39fbfbd9ff2a Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-201-1/+4
| |\ | | | | | | | | | | | | | | | | | | Conflicts: LICENSE.GPLv2 Change-Id: Id7e321e81c3b3af0c17c9d32d25c0bb905974728
| | * Account for the devicePixelRatio when painting the iconAndy Shaw2015-02-181-1/+4
| | | | | | | | | | | | | | | Change-Id: Ie5995a71780842c86ce017793f4ed744c930bbbb Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* | | Use QByteArray::toDouble() instead of qstrtod.Erik Verbruggen2015-02-271-4/+1
|/ / | | | | | | | | | | | | No need to use a secretly exported symbol. Change-Id: Iaf262abcd2eefd3953e7ee72e2d4592dc9507d06 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-02-142-2/+11
|\ \
| * \ Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-132-2/+11
| |\ \ | | |/ | | | | | | Change-Id: I960859c8b76749294939042658b5ded3dfa10993
| | * Be more informative when a referenced image cannot be parsedAndy Shaw2015-02-041-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the filename or the width/height is not valid then we bail out earlier instead of trying to create an image based on the information given. This saves a bit of processing time and also allows for giving more indication as to where the problem comes from. Change-Id: I3d11aa57c0cb965159aa9e42e905ef13ba55988f Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| | * Doc: added dependency to qtsvg.qdocconfNico Vertriest2015-01-191-1/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-431810 Change-Id: Ie69aecc84d2e6f92041e029144f1dd1f37c4ac24 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | Fixed BSD licensed file headersJani Heikkinen2015-02-133-9/+9
|/ / | | | | | | | | Change-Id: Id2a266b2ec46761769a6bb220cb84dd70fec0817 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Update copyright headersJani Heikkinen2015-02-1139-262/+262
| | | | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Ie7d37928ebd680c6f1b20045de11abcd5595c73f Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-191-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I309781379da78578437ecb83a9b878c69c90f559
| * Doc: corrected links text object examplev5.4.15.4.1Nico Vertriest2014-12-231-1/+1
| | | | | | | | | | | | Task-number: QTBUG-43462 Change-Id: I9c5092d68b767cafe2c98838e32b205311105452 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-173-3/+5
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6429aa789e022fedababb8ec6bca144f7ce8721f
| * fix build with QT_NO_GRAPHICSVIEWAshish Kulkarni2014-12-172-3/+3
| | | | | | | | | | | | | | | | | | QGraphicsItem is not available if QT_NO_GRAPHICSVIEW is defined, but this was not checked when building QGraphicsSvgItem. Change-Id: I24b9f784d12a9ce4cbf5a4ffd22690c6441f6118 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
| * Fix "unhandled metric 11" warning in QSvgGenerator::metric().Mitch Curtis2014-12-101-0/+2
| | | | | | | | | | | | | | | | | | cea58f4b77e1639e5671cf424544d4948fb8e9ef introduced a new enum value that wasn't handled by the switch statement. Change-Id: I40a44cb7694f9a0f454bfadf014d09c67538daad Task-number: QTBUG-43197 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-278-39/+97
|\ \ | |/ | | | | Change-Id: I5b19779c01657b0952dbbe3605dd8d3947b33556
| * Export private symbols for use from other Qt modulesv5.4.0-rc1v5.4.05.4.0Louai Al-Khanji2014-11-188-39/+97
| | | | | | | | | | Change-Id: I74aa76cb485cb652eba04ff2387165bab9663c99 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-274-8/+5
|\ \ | |/ | | | | Change-Id: I1ed84131c65cb9f047a0f393ebd845282daad499
| * Correctly handle Miter joins in all casesLars Knoll2014-10-203-7/+4
| | | | | | | | | | | | | | | | SVG uses SvgMiterJoin, not the Qt definition of miter joins at all times. Change-Id: I85b8e13609fa37384f09457f724a42d720769028 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| * Don't stroke a path if it's not specified in the SVGLars Knoll2014-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The code in the svg renderer is using a QPen with it's brush set to Qt::NoBrush as a hack to indicate that we don't have a stroke to paint, but to nevertheless use QPen to keep track of state. So when rendering, we have to check for the pen having no brush and in that case not draw anything. Task-number: QTBUG-36767 Change-Id: Ib622c7d0108e7360437f57853f11c65190c16773 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-202-2/+2
|\ \ | |/ | | | | Change-Id: I521c0f85547f8a3272d201e2c7d48341bbf9034c
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-10-141-1/+1
| |\ | | | | | | | | | Change-Id: Ideff1b627a310a85d728d74ed25b83e7de5352fe
| | * fix crash on malformed SVG5.3Joerg Bornemann2014-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a gradient that references itself via xlink:href we encountered an infinite recursion, and eventually a stack overflow. Now we print a warning and ignore the invalid link. Task-number: QTBUG-35387 Change-Id: Id72800eaa267d015a471df284245861ed8bc94cd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * | Doc: Applied title case to section1 titlesv5.4.0-beta1Nico Vertriest2014-10-101-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-41250 Change-Id: I32a25f6c524503cf6de5e9349d4817747bafe076 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | QSvgGenerator: make use of the <circle> and <ellipse> elementsJoerg Bornemann2014-10-071-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][][QSvgGenerator] Make use of the <ellipse> element for drawing ellipses. Ellipses that are circles are rendered using the <circle> element. Task-number: QTBUG-1359 Change-Id: I3d451e8670202be8ffb5c4feb8523aaf05bfbdfb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | | QSvgGenerator: make use of the <rect> elementJoerg Bornemann2014-10-071-0/+16
|/ / | | | | | | | | | | | | | | | | | | [ChangeLog][][QSvgGenerator] Make use of the <rect> element for drawing rectangles instead of generating a number of path strokes. Task-number: QTBUG-1359 Change-Id: I54163a13f66089c7ff3d29953ba3e923e3983517 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | Fix drawGlyphRun on a QSvgGeneratorAllan Sandfeld Jensen2014-09-171-0/+2
| | | | | | | | | | | | | | | | | | Make QSvgPaintEngine::drawTextItem handle the case where a text-item has no chars but only glyphs, like it will when using drawGlyphRun. Task-number: QTBUG-39953 Change-Id: Id912c11f8830a450279943de657546e5cee762f3 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-2531-587/+339
| | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I847adeea20fd98e5c9a18b8c44a15de84283f216 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
|/ | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I5dd19c5ee43012f30b932e8f2417cfd8ac6c9330 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Remove obsolete dependency on QtXmlv5.3.1stable5.3.1Alessandro Portale2014-05-202-7/+1
| | | | | | | | | | | | A while a go, QtSvg was changed to use the QXmlStream* classes from QtCore. Now, only tests/auto/qsvggenerator is left with a QtXml dependency. This patch also reverts commit b719b93770393bbf20251e1dffc70498061e612c Change-Id: I67417a27aa66a2db6d1985cad73e5bab806ad7d2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove dependency of the SVG icon engine plugin on QtWidgets.Friedemann Kleint2014-05-163-10/+6
| | | | | | | | | Use the virtual QGuiApplicationPrivate::applyQIconStyleHelper() introduced by commit 6c06e14a49773ce5572935864ed6b9be219c6103 in qtbase to adapt the icon according to the style. Change-Id: I7c429f818c012c58118c64cc3b20a87fcb712877 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Let svg plugins extend svg modulev5.3.0-rc1v5.3.0release5.3.0Richard Moe Gustavsen2014-05-022-2/+2
| | | | | | | | | | | | | svg plugins are by default not linked together with QtGui since its usage is rare. But when the pro file contains Qt += svg, then its the opposite; The application is likely to need the svg plugins. Many of the examples shipped with the SDK fails building on iOS (e.g accelbubble) because of this. Change-Id: I83873d5405fde2b3d38e836057d55fcc2ceb9b6c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* avoid that SVG-based plugins are automatically linked to static appsOswald Buddenhagen2014-04-092-0/+2
| | | | | | | these plugins are relatively unlikely to be needed, so exclude them. Change-Id: I57461ccdc9a7114444a2f623328239e580e4c2e9 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Fixes: runtime warnings when trying to render 0-size iconv5.3.0-beta1aavit2014-03-171-0/+3
| | | | | | Task-number: QTBUG-37035 Change-Id: I014988cdb57a2001685a8d50d79ee103322ed021 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Replace win32-g++ with mingw scopev5.3.0-alpha1Kai Koehne2014-02-081-1/+1
| | | | | | | | | | Commit 773dd01 in qtbase introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. (see 278152fff for a similar commit in qtbase). Change-Id: I430ab289af99e96cd6ed6edfd683258defcb13a4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove unused pmKey functionv5.2.1Thiago Macieira2014-01-091-5/+0
| | | | | | | Found by Clang 3.4. Change-Id: Ie4e9fc535ee44caae561aacdc245c64ea5b30b46 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Android: Make libQt5Xml.so a default dependency of Qt Svgv5.2.0-rc1v5.2.0Eskil Abrahamsen Blomfeldt2013-11-081-0/+6
| | | | | | | | | | When we depend on Qt Svg, we probably also want to be able to use the image formats plugin, which also depends on Qt Xml. To make this possible, we add a default dependency on libQt5Xml. Task-number: QTBUG-34586 Change-Id: I59fa54eabb2e4f71d6b89cc1b04b36b704154a9b Reviewed-by: Christian Stromme <christian.stromme@digia.com>