diff options
| author | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-09-23 10:10:59 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-09-23 10:13:05 (GMT) |
| commit | d1817df87461fc071527eb77d3c1259e713b94a4 (patch) | |
| tree | 1259e69aa9b6bb1a19ea937cc1b96635c0b6b162 /src/gui/image/qpixmapdata.cpp | |
| parent | 6397e5bc49f11e20a9d1838d8d8df46dd9486263 (diff) | |
| download | Qt-d1817df87461fc071527eb77d3c1259e713b94a4.zip Qt-d1817df87461fc071527eb77d3c1259e713b94a4.tar.gz Qt-d1817df87461fc071527eb77d3c1259e713b94a4.tar.bz2 | |
Compile on Symbian - rework the X11 mask patch a bit.
Avoid adding a virtual QPixmapData::hasMask() function, we can
do without it. Made QPixmap::hasAlpha() fast, so we can use that
instead.
Reviewed-by: Samuel
Diffstat (limited to 'src/gui/image/qpixmapdata.cpp')
| -rw-r--r-- | src/gui/image/qpixmapdata.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/image/qpixmapdata.cpp b/src/gui/image/qpixmapdata.cpp index 2813ed1..ef1f6c4 100644 --- a/src/gui/image/qpixmapdata.cpp +++ b/src/gui/image/qpixmapdata.cpp @@ -239,11 +239,6 @@ QBitmap QPixmapData::mask() const return QBitmap::fromImage(mask); } -bool QPixmapData::hasMask() const -{ - return hasAlphaChannel(); -} - QPixmap QPixmapData::transformed(const QTransform &matrix, Qt::TransformationMode mode) const { |