diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 23:10:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 23:10:54 (GMT) |
| commit | 49aa3d3a6bfd8befec2a00ff6166fe0e9fcf684d (patch) | |
| tree | aafc91b26127f84af34460e89defe13497189b51 /src/gui/image/qpixmap.cpp | |
| parent | de20fdfb1da72d2ad89689f46f8412c04c25fc96 (diff) | |
| parent | af1f28a0d78deee31c5df0d7d042ae7671c8c34c (diff) | |
| download | Qt-49aa3d3a6bfd8befec2a00ff6166fe0e9fcf684d.zip Qt-49aa3d3a6bfd8befec2a00ff6166fe0e9fcf684d.tar.gz Qt-49aa3d3a6bfd8befec2a00ff6166fe0e9fcf684d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Cleanup QEglContext & EGLDisplays
Moved 'hasAlpha' property from GL2 engine to GL paint device.
Remove useless qDebug in QTextCodec autotest
QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec cannot be loaded
Add caching to QTextCodec::codecForName and QTextCodec::codecForMib
Add benchmark for QTextCodec
Fix several bugs with GL texture cache
Compile fix for OpenGL ES.
Fix missing/outdated license headers.
Turned off subpixel AA text on surface with alpha in GL2 engine.
Add functional Graphics View benchmarks.
Make QCUPSSupport::printerHasPPD() clean up after itself.
document the slowness of QPixmap::hasAlpha()
Speed up custom bitmap brushes on X11 without Xrender support.
Diffstat (limited to 'src/gui/image/qpixmap.cpp')
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index d1e5c40..1df7946 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -1670,10 +1670,9 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) \o The hasAlphaChannel() returns true if the pixmap has a format that - respects the alpha channel, otherwise returns false, while the - hasAlpha() function returns true if the pixmap has an alpha - channel \e or a mask (otherwise false). The mask() function returns - the mask as a QBitmap object, which can be set using setMask(). + respects the alpha channel, otherwise returns false. The hasAlpha(), + setMask() and mask() functions are legacy and should not be used. + They are potentially very slow. The createHeuristicMask() function creates and returns a 1-bpp heuristic mask (i.e. a QBitmap) for this pixmap. It works by @@ -1760,6 +1759,8 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) Returns true if this pixmap has an alpha channel, \e or has a mask, otherwise returns false. + \warning This is potentially an expensive operation. + \sa hasAlphaChannel(), mask() */ bool QPixmap::hasAlpha() const |