diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-21 16:16:18 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-21 16:16:18 (GMT) |
commit | fe1a44a850e61d8b64626424b45ef7592ec66589 (patch) | |
tree | 5cceb6849ddebd37f3098664c52bdb629543cca1 /src/gui/image/qpixmap.cpp | |
parent | ef01812875f0dfc8e032fefb90f1afeb57aaa821 (diff) | |
parent | 2181a341839b72a627a7ef641de58d1d2411f123 (diff) | |
download | Qt-fe1a44a850e61d8b64626424b45ef7592ec66589.zip Qt-fe1a44a850e61d8b64626424b45ef7592ec66589.tar.gz Qt-fe1a44a850e61d8b64626424b45ef7592ec66589.tar.bz2 |
Merge branch 'master' of git:qt/qt
Conflicts:
doc/src/declarative/advtutorial1.qdoc
doc/src/declarative/advtutorial2.qdoc
doc/src/declarative/advtutorial3.qdoc
doc/src/declarative/advtutorial4.qdoc
doc/src/declarative/tutorial1.qdoc
doc/src/declarative/tutorial2.qdoc
doc/src/declarative/tutorial3.qdoc
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 7cafbd0..ae62f06 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -1690,10 +1690,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 @@ -1780,6 +1779,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 |