summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qimage.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-131-0/+5
|\ | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h src/corelib/tools/qsimd.cpp
| * C++0x move operatorsOlivier Goffart2010-09-031-0/+5
| | | | | | | | | | | | | | This makes assignement faster from temporaries, as the operator is fully inline, and doesn't do any atomic operations. Reviewed-by: joao
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-191-0/+3
|\ \ | |/
| * QImage::fill() overloads that take QColor and Qt::GlobalColorGunnar Sletta2010-08-041-0/+3
| | | | | | | | | | | | | | This will break source compatibility in some cases, but only when the user has a bug in the first place, so this is preferable Reviewed-by: Eskil
* | Merge remote branch 'origin/4.7' into 4.7-lighthouseJørgen Lind2010-03-111-0/+1
|\ \ | |/ | | | | | | | | | | Conflicts: src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp
| * Added QImage::bitPlaneCount().aavit2010-03-041-0/+1
| | | | | | | | | | | | | | | | | | When the image format contains unused bits (e.g. Format_RGB32), depth() does not give the true number of bits of color information per pixel. This new function does. Task-number: QTBUG-7982 Reviewed-by: Trond
* | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-011-0/+2
|\ \ | |/ | | | | | | | | | | Conflicts: configure src/gui/egl/qegl.cpp src/gui/kernel/qdnd_p.h
| * Merge branch '4.6'Thiago Macieira2010-01-131-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | Add QImage::constBits() and QImage::constScanLine()Rhys Weatherley2010-01-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | QImage::bits() and QImage::scanLine() can create deep copies if the QImage is not const. The constBits() and constScanLine() functions make things more explicit and less error-prone. Reviewed-by: Daniel Pope
* | | Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2010-01-141-1/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.cpp src/gui/dialogs/dialogs.pri
| * | Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| |/ | | | | | | Reviewed-by: Trust Me
| * Compile with QT_NO_DEPRECATEDOlivier Goffart2009-12-091-0/+6
| | | | | | | | | | | | | | uses of QT_DEPRECATED must be protected by #ifdef Task-number: QTBUG-6649 Reviewed-by: João Abecasis
* | Added QBlittablePixmapDataJørgen Lind2009-11-251-0/+1
|/ | | | Is going to be used by everyone that reimplements QBlittable
* API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-061-3/+6
| | | | | | | | | | QPaintDevice and QImage used the functions numColors(), setNumColors(), and numBytes(). However, this is not consistent with the rest of the Qt API which uses *Count() and set*Count(). Removed all usage of these functions inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* Fix a bug in QPixmapCache when the cache is trimmed by QCache.Alexis Menard2009-09-291-1/+1
| | | | | | | | | | | There was a bug in QPixmapCache when QCache trims the content, some keys were not invalidated. The ifdef for WinCE (that i removed) was a wrong fix, it let the auto-test pass but it doesn't fix the bug. The approach here is to add a QPixmapCacheEntry that release the key it owns when QCache deletes it : we are now sure that nothing happen in our back. Reviewed-by:paul Reviewed-by:trond
* Update license headers again.Jason McDonald2009-09-091-4/+4
| | | | Reviewed-by: Trust Me
* Update tech preview license header.Jason McDonald2009-08-311-13/+13
| | | | Reviewed-by: Trust Me
* Update license headers.Jason McDonald2009-08-111-1/+1
| | | | Reviewed-by: Trust Me
* Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| | | | Reviewed-by: Trust Me
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+352