summaryrefslogtreecommitdiffstats
path: root/src/plugins/imageformats/ico
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devLars Knoll2020-03-042-15/+0
|\
| * Remove overrides of QImageIOHandler::name()Shawn Rutledge2020-03-032-15/+0
* | Make bytes-per-line safe for int overflowAllan Sandfeld Jensen2020-02-201-3/+3
* | Regenerate projects to correctly handle private dependenciesAlexandru Croitor2020-02-051-2/+1
* | Regenerate plugin projects to get new target namesAlexandru Croitor2020-01-272-7/+6
* | Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-242-13/+4
|\ \ | |/
| * Modernize setAlphaChannel(), and deprecated alphaChannel()Allan Sandfeld Jensen2020-01-051-2/+0
| * Fix unneeded use of QImage invertPixels and createAlphaMaskAllan Sandfeld Jensen2019-12-191-9/+2
| * Deprecate constructing QFlags from a pointerAllan Sandfeld Jensen2019-11-201-2/+2
* | Regenerate src/*Alexandru Croitor2019-11-141-1/+1
* | Regenerate everything under ./srcAlexandru Croitor2019-11-121-1/+0
* | Regenerate plugins bearer and imageformats projectsAlexandru Croitor2019-10-082-6/+27
* | Merge branch 'wip/qt6' into wip/cmakeAlexandru Croitor2019-08-152-1/+4
|\ \ | |/
| * Fix compilation with disabled deprecated APIsSona Kurazyan2019-07-082-1/+4
* | cmake: register plug-ins, create dependencies fileJean-Michaƫl Celerier2019-06-041-0/+2
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-06-031-10/+14
|\ \ | |/
| * Fix artifacts when reading certain 32 bit ico filesEirik Aavitsland2019-04-251-10/+14
* | CMake: Regenerate src/plugins/imageformatsTobias Hunger2019-05-061-2/+8
* | Merge commit 'dev' into 'wip/cmake-merge'Tobias Hunger2019-04-161-0/+2
|\ \ | |/
| * ico image handler: check for out of range image sizeEirik Aavitsland2018-12-031-0/+2
* | cmake: Build src/plugins/imageformatsAlbert Astals Cid2019-02-011-0/+15
|/
* Fix ico.json to avoid returning an empty mimetypeDavid Faure2018-06-221-1/+1
* Move endian integers to qendian_p.hAllan Sandfeld Jensen2017-06-212-96/+33
* Replace Q_DECL_OVERRIDE with override in imageformatsJesus Fernandez2017-04-072-11/+11
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-231-5/+5
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-5/+5
| |\
| | * ICO image format: fix regression in writing when size >= 256Eirik Aavitsland2016-05-131-5/+5
* | | Always build JPEG and GIF support as pluginsLars Knoll2016-04-071-5/+2
|/ /
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-111-4/+4
|\ \ | |/
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-03-071-4/+4
* | Updated license headersJani Heikkinen2016-01-154-56/+80
|/
* Fix maximum size of .ico files in ICOReader::write()Serge Lysenko2015-09-241-4/+6
* Implement the QImageIOHandler::ImageFormat option for ico files.Serge Lysenko2015-09-231-4/+22
* Fix QImageReader::size() to return correct size for .ico files.Serge Lysenko2015-09-171-13/+8
* Replace #ifdefs with qmake feature checks.Ulf Hermann2015-06-222-8/+0
* QtIcoHandler: don't hold images in QListMarc Mutz2015-06-221-7/+9
* Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-03-311-1/+1
|\
| * Fixes crash in bmp and ico image decodingEirik Aavitsland2015-03-131-1/+1
* | QPA plugins: Fix const correctness in old style castsThiago Macieira2015-03-091-1/+1
* | Update copyright headersJani Heikkinen2015-02-114-28/+28
* | Add Q_DECL_OVERRIDE in the src subdirectoryOlivier Goffart2014-12-032-11/+11
|/
* Removing a few unneeded "? true : false"Alessandro Portale2014-10-091-4/+4
* Update license headers and add new license filesMatti Paaso2014-09-244-76/+44
* Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-011-1/+6
|\
| * QIcon: Prefer high-quality images of Windows .ico files.Friedemann Kleint2014-06-221-1/+6
* | Make the ICO image handler capable of reading CUR files too.Robin Burchell2014-06-053-7/+7
|/
* Doc: Adding mark-up to boolean default values.Jerome Pasion2013-10-081-2/+2
* Remove use of 'register' from Qt.Stephen Kelly2013-06-171-2/+2
* Whitespace cleanup: remove trailing whitespaceAxel Waggershauser2013-03-162-4/+4
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/stagi...Frederik Gladhorn2013-01-234-4/+4
|\