summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused methods from plugin classes5.7.1Alexander Volkov2016-11-112-16/+0
| | | | | | | | Remove QIconEnginePlugin::keys() and QImageIOPlugin::keys(): they are not overriders since Qt 5.0. Change-Id: I9127b5b72c9c37b450c6f0d0095e47b8d5454322 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Add missing 'override' keyword to pluginsAlexander Volkov2016-11-114-18/+18
| | | | | | | Change-Id: I423b8531434d221880410cb3b40f10e6061769ff Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Replace Q_DECL_OVERRIDE by overrideAlexander Volkov2016-11-101-11/+11
| | | | | Change-Id: I05e7e2984c70173408491deeeb2df92a578f00f9 Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1Liang Qi2016-09-172-1/+18525
|\ | | | | | | Change-Id: I7680d625bf0afec0bfd16a97c6656aab426f39a7
| * 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>
* | BC data files for QtSvg (5.7)Milla Pohjanheimo2016-09-131-0/+18956
| | | | | | | | | | | | | | | | | | Added the generated data files for the binary compatibility tests for QtSvg for Qt 5.7. Change-Id: If0ab582be115808446b85815cbac5ed55039600e Reviewed-by: Sergio Ahumada <sahumada@texla.cl> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | QSvgIconEngine::addFile(): Use QMimeDatabase to determine file typeFriedemann Kleint2016-08-301-18/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | Introduce an enumeration to describe the file type and use QMimeDatbase to determine the type. This will detect SVG files also in the case resource aliases without suffixes are used. As a drive by, do not pass compressed SVG files to QPixmap when QT_NO_COMPRESS is defined, as this likely results in garbage. Task-number: QTBUG-55388 Change-Id: Ib8bafca60e9238412a5c7edf560d487e512b8fd0 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-017-14/+21
|\ \ | |/ | | | | Change-Id: I8b1872f788a714894a73912700bcd07d72db31bc
| * 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>
* | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | Change-Id: I390c026e099233e2fa011ec247dacdd4a485b452
* | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-0/+32
|\ \ | | | | | | | | | Change-Id: I4742d08412c8d351fb8cb5ea1365bf0fc3fe7cd5
| * | Mention license change in 5.7.0 changelog.v5.7.05.7.0Kai Koehne2016-06-081-0/+32
|/ / | | | | | | | | | | | | Change-Id: I0ed18f6dde71827aee68dc24fe3b1d24d794b4e2 Task-number: QTBUG-53913 Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-199-213/+13
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I55408b98072be007247bca4fa61f1a62ce32e7ca
| * 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-082-3/+5
|\ \ | |/ | | | | Change-Id: I14c3db02026247710ea21ef90e804773acf53cac
| * 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>
* | purge symbian vestigeOswald Buddenhagen2016-04-061-4/+0
| | | | | | | | | | Change-Id: Iad8cc499bd7b7ff973191be762858c12ca7ceef0 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | QSvgGenerator: remove unused varAnton Kudryavtsev2016-03-291-2/+0
| | | | | | | | | | Change-Id: Iccc2699ace61727ae07b362442a0b87f9958e4e0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | SVG viewer: Add export option.Friedemann Kleint2016-03-157-6/+363
| | | | | | | | | | | | | | | | | | Add an option to export an image giving a size. This can be used for creating High DPI icons from SVG files among other things. Task-number: QTBUG-49374 Change-Id: I0437889961bc6e646667c5165584002f7ab4d952 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | Polish the SVG viewer example.Friedemann Kleint2016-03-115-87/+102
| | | | | | | | | | | | | | | | | | | | | | | | - Use Qt 5 connection syntax, demonstrating lambdas. - Use QCommandLineParser. - Improve error handling. - Use Mime API of QFileDialog, point to pictures location initially. - Prevent the application from shrinking when loading small images. - Minor polishing, status messages on loading, About Qt dialog. Change-Id: I76f14001c9ab12cbfaaacc2ca4828b404e4b13b2 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-076-20/+21
|\ \ | |/ | | | | 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-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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-156-8/+22
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia508d1e3f74dd35ac28b104c0cbdacdb6fe16d6b
| * 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>
* | | Fix building with unusual optionsUlf Hermann2016-02-084-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building without image format plugins we shouldn't even try to build the svg image format plugin. Otherwise it will fail to load later. Then icon engine plugin, however, can easily be built even without image formats. Furthermore, the network example needs bearer management. Change-Id: I1380e5b2de7d112283ef0fb65a01a5049412af55 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | | Updated license headersJani Heikkinen2016-01-257-102/+776
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are licensed under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: Ia9ba3f9e0c35ea5ae4b1b310f310f44aaf95a7f6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Updated license headersJani Heikkinen2016-01-2518-294/+600
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> examples are licensed under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header instead of LGPL21 one (in those files which will be under BSD) Change-Id: I24ade8428a20f6c0070729b5fa8b20839f07a143 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Updated license headersJani Heikkinen2016-01-2535-448/+1818
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
View Lorry Controller Status