diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-06-12 14:41:19 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-06-12 15:21:15 (GMT) |
| commit | 22fc2f7a832d8dc19c23b92710f520149e439971 (patch) | |
| tree | 041f5d34a15f1191381ba51509578d1f33b2bb1b /src/opengl/qpixmapdata_gl.cpp | |
| parent | 4c2697c093a495c289b1eb0689ac9bbca5442343 (diff) | |
| download | Qt-22fc2f7a832d8dc19c23b92710f520149e439971.zip Qt-22fc2f7a832d8dc19c23b92710f520149e439971.tar.gz Qt-22fc2f7a832d8dc19c23b92710f520149e439971.tar.bz2 | |
Fixed bitmap drawing in GL 2 engine when not using GL pixmap backend.
QPixmap shouldn't return true in hasAlphaChannel() for bitmaps, instead
the paint engine should check whether the pixmap is a bitmap or not. In
addition, QBrush::isOpaque() returned true for bitmap brushes, which is
wrong according to the documentation.
Reviewed-by: Trond
Diffstat (limited to 'src/opengl/qpixmapdata_gl.cpp')
| -rw-r--r-- | src/opengl/qpixmapdata_gl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp index 4c53c46..48feb82 100644 --- a/src/opengl/qpixmapdata_gl.cpp +++ b/src/opengl/qpixmapdata_gl.cpp @@ -262,7 +262,7 @@ void QGLPixmapData::fill(const QColor &color) bool QGLPixmapData::hasAlphaChannel() const { - return pixelType() == BitmapType || m_hasAlpha; + return m_hasAlpha; } QImage QGLPixmapData::fillImage(const QColor &color) const |