summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Expand)AuthorAgeFilesLines
* 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 branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-142-8/+28
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-132-8/+28
| |\ \ | | |/
| | * Prevent always deep-copying in QPixmap::toImage() for raster pixmaps.Samuel Rødal2010-12-071-5/+8
| | * Make sure to do a deep copy of a QImage when it's being painted on.Samuel Rødal2010-12-062-8/+25
* | | Corrected documentation for QImage::fill().Kim Motoyoshi Kalland2010-12-131-2/+2
|/ /
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-36/+48
|\ \ | |/
| * Improvement of de30288: handle PNGs having 1 to 4 bytes truncated.aavit2010-12-011-1/+2
| * Workaround for certain malformed PNGs that lack the final crc bytesaavit2010-12-011-34/+46
* | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2010-12-022-0/+21
|\ \
| * \ Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-291-0/+2
| |\ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-11-1914-56/+105
| |\ \ \
| * | | | Moving QCoreTextFontEngine with related classes into own fileJørgen Lind2010-10-282-0/+21
* | | | | QRasterPixmapData: Reuse underlying QImage in fill() if possible.Andreas Kling2010-11-303-40/+46
| |_|/ / |/| | |
* | | | Fix some warnings on MacJiang Jiang2010-11-221-0/+2
| |/ / |/| |
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-123-2/+5
|\ \ \ | | |/ | |/|
| * | Doc: Fixing typoSergio Ahumada2010-11-092-2/+2
| * | Fixed tst_qwidget::testContentsPropagation auto-test failure.Samuel Rødal2010-11-091-3/+5
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-051-2/+3
| |\ \
| | * | Fixed grabWidget sometimes returning uninitialized memory.Samuel Rødal2010-11-031-2/+3
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-8/+17
|\ \ \ \ | |/ / /
| * | | Prevent excessive seeks in xbm detectionHarald Fernengel2010-11-041-8/+17
| |/ /
* | | Add member-swap to shared datatypes that don't have it.Marc Mutz2010-11-0310-0/+47
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-11-029-2/+549
|\ \ \ | | |/ | |/|
| * | Fix the license in files for LighthouseJørgen Lind2010-10-282-0/+82
| * | Fix qt_defaultDpi, but not use Q_DECL_IMPORT but Q_GUI_EXPORTJørgen Lind2010-10-281-2/+2
| * | Compile fix for RVCT 4Jørgen Lind2010-10-281-2/+2
| * | Fix QT_BLITTER_RASTEROVERLAY and namespace errorJørgen Lind2010-10-271-1/+2
| * | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-262-1/+2
| |\ \
| * \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-224-2/+19
| |\ \ \
| * \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-055-76/+107
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-275-50/+51
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-136-3/+68
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-261-3/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-198-51/+278
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterJørgen Lind2010-08-053-9/+6
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-08-035-19/+208
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Removed createBlittable factory function from PlatformIntegrationJørgen Lind2010-07-222-8/+5
| * | | | | | | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-044-18/+207
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-07-199-2/+469
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-1429-129/+4170
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-06-245-83/+400
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Refactored QGraphicsSystemCursor -> QPlatformCursorJørgen Lind2010-06-241-0/+4
| | * | | | | | | | | | | | | Adding -qpa configure switchJørgen Lind2010-06-241-2/+2
| | * | | | | | | | | | | | | Renamed files from *_lite* to *_qpa*Jørgen Lind2010-06-242-1/+1
| | * | | | | | | | | | | | | Say hello to Q_WS_QPA!Jørgen Lind2010-06-244-5/+5
| | * | | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-1816-80/+196
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-05-107-17/+67
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-218-16/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \