summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Document 3rd party code using new setupv5.8.0-rc1v5.8.05.8.0Kai Koehne2016-12-074-63/+47
| | | | | Change-Id: I7495086a3712ef817380c80d3dea7d49da047ed8 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-2610-48/+61
|\ | | | | | | Change-Id: I43247261a4dc8badc4ad4f4d2137cdbd499f29db
| * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-247-3/+32
| |\ | | | | | | | | | Change-Id: Ibcca419da389fc7538ee050de7c59e8b400e1978
| | * Use separate metadata files for plugins if QT_NO_COMPRESS is definedAlexander Volkov2016-11-105-0/+16
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ib15aa96c2ed84cf3ce9793385476f9fb3cacec8c Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * Imageformat plugin: Add mime type "image/svg+xml-compressed"Alexander Volkov2016-11-101-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I3cf5d9b6d6212128adab4682de33b192672f7c1f Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * Ignore .svgz images unless compression is enabledAlexander Volkov2016-10-272-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | The imageformats plugin was trying to pass them off to QSvgRenderer, which can't handle them when QT_NO_COMPRESS is defined. Change-Id: I92241370d8fd4ed2328fb13a01306fa8a7e5ef6e Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * | 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>
* | | Fix checking for feature 'imageformatplugin' in pluginsFriedemann Kleint2016-11-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix warning: qtsvg/src/plugins/plugins.pro:3: Cannot find feature qfeatures Change-Id: I0484aa2b1b217f1e22dc91a5d346bfeade175ab4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-beta1Liang Qi2016-09-191-19/+39
|\ \ \ | |/ / | | | | | | Change-Id: Ib061ded7b4a5e18a1e4d277a840c1916aa51c79f
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1Liang Qi2016-09-171-1/+1
| |\ \ | | |/ | | | | | | 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>
| * | 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>
* | | 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-243-5/+13
|\ \ \ | |/ / | | | | | | Change-Id: I02f07888db8531778c1e28aa3da6d2166c7b8c8a
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-193-5/+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>
| | * | 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>
| | * 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-087-22/+21
|\ \ \ | |/ / | | | | | | 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-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>
* | | 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-154-8/+9
|\ \ | |/ | | | | | | | | | | 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>
| * | Improve format detection in the image reader pluginv5.6.0-beta1Eirik Aavitsland2015-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-083-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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>
View Lorry Controller Status