diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-12 12:43:15 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-12 12:43:15 (GMT) |
| commit | 5038fe5d545292c58f0e06b1b6a34115ef8d357a (patch) | |
| tree | 87a5ed53c8be616d5437fa0877ec2ea98de5c614 /src/opengl/qpixmapdata_gl_p.h | |
| parent | c53414e11b3f980f81a4470b3fb52f9d1aa80d56 (diff) | |
| parent | d834d94bde645d43dd981154bd0ba99d8e81f040 (diff) | |
| download | Qt-5038fe5d545292c58f0e06b1b6a34115ef8d357a.zip Qt-5038fe5d545292c58f0e06b1b6a34115ef8d357a.tar.gz Qt-5038fe5d545292c58f0e06b1b6a34115ef8d357a.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/opengl/qpixmapdata_gl_p.h')
| -rw-r--r-- | src/opengl/qpixmapdata_gl_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/opengl/qpixmapdata_gl_p.h b/src/opengl/qpixmapdata_gl_p.h index 1b6b7ae..af10f2c 100644 --- a/src/opengl/qpixmapdata_gl_p.h +++ b/src/opengl/qpixmapdata_gl_p.h @@ -115,6 +115,8 @@ private: static bool useFramebufferObjects(); + QImage fillImage(const QColor &color) const; + int m_width; int m_height; @@ -131,6 +133,8 @@ private: // represented by a single fill color mutable QColor m_fillColor; mutable bool m_hasFillColor; + + mutable bool m_hasAlpha; }; QT_END_NAMESPACE |