diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-23 02:58:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-23 02:58:24 (GMT) |
| commit | 4f24b2fbe7fbbdae95b27381e258ec7b665445c5 (patch) | |
| tree | 1f097bef227573e2c46f988ef88d9d357337dc9e /src/gui/image/qpixmapdata.cpp | |
| parent | 973b1643a9426d2a60bca9025fa02cb5d627ec28 (diff) | |
| parent | 4252b1cadf1eef24a1d173bbb41ee56ab8fe0480 (diff) | |
| download | Qt-4f24b2fbe7fbbdae95b27381e258ec7b665445c5.zip Qt-4f24b2fbe7fbbdae95b27381e258ec7b665445c5.tar.gz Qt-4f24b2fbe7fbbdae95b27381e258ec7b665445c5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QPainter not restored correctly in Graphics View.
Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShape
Fix compilation
Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines.
Fix warning on MSVC
QThread: make sure start works even if called after exit
Revert "Fixed painter path drawing on FBO without stencil buffer."
Fix a crash with D&d on mingw
Revert "Keep other text format with QTextOption::SuppressColors tag on"
Fixed stencil buffer on FBOs with OpenGL ES.
Keep other text format with QTextOption::SuppressColors tag on
QTreeView: do not scroll to top if last item is removed
Diffstat (limited to 'src/gui/image/qpixmapdata.cpp')
| -rw-r--r-- | src/gui/image/qpixmapdata.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/image/qpixmapdata.cpp b/src/gui/image/qpixmapdata.cpp index ef1f6c4..2813ed1 100644 --- a/src/gui/image/qpixmapdata.cpp +++ b/src/gui/image/qpixmapdata.cpp @@ -239,6 +239,11 @@ QBitmap QPixmapData::mask() const return QBitmap::fromImage(mask); } +bool QPixmapData::hasMask() const +{ + return hasAlphaChannel(); +} + QPixmap QPixmapData::transformed(const QTransform &matrix, Qt::TransformationMode mode) const { |