summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | 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>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-145-183/+688
|\ \ \ | |/ / | | | | | | Change-Id: Ia65d317d50da6e8ac06eade2c363f95e325c20f2
| * | 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>
* | | | Bump versionOswald Buddenhagen2015-09-101-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ib572054ed49a2d94b4094e807c62ac1cf9be6ab9
* | | | Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.Friedemann Kleint2015-08-314-4/+0
|/ / / | | | | | | | | | | | | Change-Id: I680bec9dc24f151c1882e4f230aa5e93bca6615c Reviewed-by: Liang Qi <liang.qi@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