summaryrefslogtreecommitdiff
path: root/src/svg
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-261-11/+11
|\ | | | | | | Change-Id: I43247261a4dc8badc4ad4f4d2137cdbd499f29db
| * Replace Q_DECL_OVERRIDE by overrideAlexander Volkov2016-11-101-11/+11
| | | | | | | | | | Change-Id: I05e7e2984c70173408491deeeb2df92a578f00f9 Reviewed-by: hjk <hjk@qt.io>
* | QSvgGenerator: prefer QColor::name() over QString::arg() cascadeMarc Mutz2016-09-131-5/+1
| | | | | | | | | | Change-Id: I994bcc0a4d0587dbb1f0566a7a6b3f110f1175aa Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Eradicate Q_FOREACH loops and mark the module as Q_FOREACH-freeMarc Mutz2016-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In BearerCloud::timerEvent(), bite the bullet and use a std::vector instead of a QList to avoid repeated qAsConst() applications. In BearerCloud::configurationRemoved() and configurationChanged(), instead of iterating over QMultiMap::uniqueKeys() and QMap::remove(), iterate directly over the QMultiMap and remove the desired elements. Cache a QString. In BearerCloud::updateConfigurations(), instead of using while !isEmpty() takeFirst() on a local copy of a QList, simply iterate over the QList (now made const) using C++11 ranged for. In tst_QSvgGenerator, replace a QList of statically-known size with a C array. Change-Id: Ic0dd1c67d0819fe6167f2bce248f9b910be65803 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Fix build after qtConfig changes in qtbasev5.8.0-alpha1Lars Knoll2016-08-191-8/+3
| | | | | | | | | | Change-Id: Ic345acc4e7cf08a0fd94c9e3a1fd2279cdd8a93e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-022-8/+17
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf tests/auto/qicon_svg/qicon_svg.pro Change-Id: I062ecbb9b092286c3ca7ec5deac3a0767329ba3f
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-012-8/+17
| |\ | | | | | | | | | Change-Id: I8b1872f788a714894a73912700bcd07d72db31bc
| | * 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>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-242-3/+6
|\ \ \ | |/ / | | | | | | Change-Id: I02f07888db8531778c1e28aa3da6d2166c7b8c8a
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-192-3/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I55408b98072be007247bca4fa61f1a62ce32e7ca
| | * 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>
| | * 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>
* | | Remove qsvgfunctions_wince_p.h.Friedemann Kleint2016-04-111-95/+0
| | | | | | | | | | | | | | | Change-Id: I405bdd8a5515d2e475bbe5fbb601c022f40a1169 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-085-12/+11
|\ \ \ | |/ / | | | | | | Change-Id: I8226348c242d0d5bf1f78adc376ecbe26215445e
| * | QSvgGenerator: remove unused varAnton Kudryavtsev2016-03-291-2/+0
| | | | | | | | | | | | | | | Change-Id: Iccc2699ace61727ae07b362442a0b87f9958e4e0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-074-10/+11
| |\ \ | | |/ | | | | | | Change-Id: I690e64f28de8d7a7768213f89858d3c19246fa08
| | * 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-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Remove Windows CE.Friedemann Kleint2016-03-102-141/+0
|/ / | | | | | | | | | | | | | | | | Remove #ifdef sections for Q_OS_WINCE, wince .pro file clauses and Windows CE-specific files. Task-number: QTBUG-51673 Change-Id: I07ea3a9522d5b6bd8cce6f5256d92e65a699e3f5 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-153-6/+7
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia508d1e3f74dd35ac28b104c0cbdacdb6fe16d6b
| * 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>
| * | 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>
* | | Updated license headersJani Heikkinen2016-01-2526-364/+520
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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 devFrederik Gladhorn2015-03-031-3/+3
|\ \ | |/ | | | | 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>
* | 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-1133-220/+220
| | | | | | | | | | | | | | | | | | | | 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
View Lorry Controller Status