summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-0/+2
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-111-0/+2
| |\
| | * Prevent crash in OpenGL engine when scaling images / pixmaps.Samuel Rødal2011-05-091-0/+2
* | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
|/ /
* | Removed warning from QPixmap::handle().Samuel Rødal2011-04-261-6/+2
* | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-171-11/+9
|\ \
| * \ Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-101-1/+1
| |\ \
| | * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-091-1/+1
| | |\ \ | | | |/
| | | * Fixed memory leak in GL texture cache with QRuntimePixmapData.Samuel Rødal2011-03-071-1/+1
| * | | Removed obsolete documentation from QPixmap.Samuel Rødal2011-03-071-10/+0
| * | | Fixed auto-test failures caused by a3a79fefe65ec12.Samuel Rødal2011-03-071-2/+5
| * | | Fail in a nicer way when QPixmap is used in a non-GUI application.Samuel Rødal2011-03-041-0/+5
| |/ /
* | | added capabilites to QPlatformIntegrationGunnar Sletta2011-03-011-0/+9
* | | Allow using QPixmap outside GUI thread when using rasterGunnar Sletta2011-03-011-5/+14
|/ /
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ | |/
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-231-2/+2
|\ \ | |/
| * Made documentation of QPixmap::createMaskFromColor match behaviour.Samuel Rødal2010-12-221-2/+2
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-0/+3
|\ \ | |/
| * Fixed tst_qwidget::testContentsPropagation auto-test failure.Samuel Rødal2010-11-091-3/+5
| * Fixed grabWidget sometimes returning uninitialized memory.Samuel Rødal2010-11-031-2/+3
* | Add member-swap to shared datatypes that don't have it.Marc Mutz2010-11-031-0/+8
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-051-12/+31
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-12/+31
| |\ \ | | |/
| | * Compile on Symbian - rework the X11 mask patch a bit.Trond Kjernåsen2010-09-231-3/+17
| | * Fixed QPixmap::resize() for X11 pixmap with masks.Trond Kjernåsen2010-09-231-9/+14
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-271-3/+12
|\ \ \ | |/ /
| * | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-09-221-1/+1
| |\ \
| | * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-3/+7
| | |\ \ | | | |/
| | | * Give a warning in QPixmap::handle() if pixmap is not X11 class.Samuel Rødal2010-09-201-2/+6
| | | * Fixed regression in QPixmap::size() for null pixmaps.Samuel Rødal2010-09-161-1/+1
| * | | Give a warning in QPixmap::handle() if pixmap is not X11 class.Samuel Rødal2010-09-181-2/+6
| * | | Make raster the default graphics system on X11.Samuel Rødal2010-09-171-0/+5
| |/ /
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-261-3/+5
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-3/+5
| |\ \ | | |/
| | * Revised fix for pixmap loadingJens Bache-Wiig2010-08-201-0/+5
| | * Fixes a regression preventing loading images without extensionsThierry Bastian2010-08-191-3/+0
* | | Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-07-191-0/+2
|\ \ \ | |/ / |/| |
| * | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-141-1/+22
| |\ \ | | |/
| * | Say hello to Q_WS_QPA!Jørgen Lind2010-06-241-1/+1
| * | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-181-17/+41
| |\ \
| * \ \ Merge remote branch 'origin/4.7' into 4.7-lighthouseJørgen Lind2010-03-111-14/+11
| |\ \ \
| * \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-011-8/+29
| |\ \ \ \
| * \ \ \ \ Merge remote branch 'remotes/qt/4.6' into lighthousePaul Olav Tvete2010-02-101-16/+17
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2010-01-141-9/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2009-11-191-45/+84
| |\ \ \ \ \ \ \
| * | | | | | | | Fix some autotest failures and get rid of some compiler warningsPaul Olav Tvete2009-10-141-2/+4
* | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-151-1/+22
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Add QPixmap::fromImageReader() to decode arbitrary images in place.Benjamin Poulain2010-06-301-1/+22
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-07-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |