summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | 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>
| * | Remove the old headersclean unit testThiago Macieira2015-03-182-4/+1
| | | | | | | | | | | | | | | | | | | | | We have configure -headersclean now Change-Id: I8811ae603503c20093f308d71e7a42e38ffac2db Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.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-0311-34528/+90895
|\ \ \ | |/ / | | | | | | 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 dev into 5.5Oswald Buddenhagen2015-02-241-1/+1
| |\ \ | | | | | | | | | | | | Change-Id: I5c60ab8323095915cf62e7309c98acd3fd3f8fcc
| * \ \ Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-2010-34525/+90892
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: LICENSE.GPLv2 Change-Id: Id7e321e81c3b3af0c17c9d32d25c0bb905974728
| | * | remove unnecessary LICENSE.GPLv2v5.4.25.4.2Jani Heikkinen2015-02-191-292/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I356b37997e8d53689daa8fb5df7b93dd9c6385ea Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
| | * | Fix test data for tst_GuiAppLauncherSergio Ahumada2015-02-181-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibe7522bc5448c82eb917f660d6e52dd1c82844c4 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| | * | 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>
| | * | bic: Add/Replace 5.{0.1,2,3,4}.0 bic data for linux-gcc-amd64Sergio Ahumada2015-02-137-34230/+90878
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the ia32 data since there are no linux x86 machines in the CI system (which makes the data useless from an automated testing point of view) and most people use x64 these days anyway. Change-Id: I8ecca25b2198285090cf2128d51554dbba15e97d Reviewed-by: Liang Qi <liang.qi@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>
* | | | Bump versionOswald Buddenhagen2015-02-241-1/+1
| |_|/ |/| | | | | | | | Change-Id: I1151419de92872991a1d301d29f9546b2ae1454b
* | | Fixed license headersJani Heikkinen2015-02-161-1/+1
|/ / | | | | | | | | Change-Id: I6b13e9931f55338efba1d219ebdfbb6bc90bb27c Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.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-1334-102/+102
|/ / | | | | | | | | Change-Id: Id2a266b2ec46761769a6bb220cb84dd70fec0817 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Update copyright headersJani Heikkinen2015-02-11109-676/+668
| | | | | | | | | | | | | | | | | | | | 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-193-8/+8
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I309781379da78578437ecb83a9b878c69c90f559
| * Bump versionOswald Buddenhagen2015-01-161-1/+1
| | | | | | | | Change-Id: If57dea889c841a24aba2826825ffe31ecf056d59
| * Doc: corrected links text object examplev5.4.15.4.1Nico Vertriest2014-12-233-8/+8
| | | | | | | | | | | | 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-174-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>
| * Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | | | | | Change-Id: If61ced5c6a7b5f1a00aaf8c913be76665dfdede5
| * 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>
| * Fix permissions of svg fileKai Koehne2014-12-011-0/+0
| | | | | | | | | | Change-Id: I57aae43b317734d86201ef3ed797ac0a44c1fe6b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-278-39/+97
|\ \ | |/ | | | | Change-Id: I5b19779c01657b0952dbbe3605dd8d3947b33556
View Lorry Controller Status