diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-19 00:29:51 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-19 00:29:51 (GMT) |
| commit | e5893ababec6c58207c8066908e21bff3d746356 (patch) | |
| tree | b4800e3a1fd5fa209b39e2f2d627081ed72bed38 /src/opengl/qgl_p.h | |
| parent | 2abbc5fc400dfa8ad26397cc39f49f9b3a4304c9 (diff) | |
| parent | ceb068261e326f38b4049becd75c7160a6b84f87 (diff) | |
| download | Qt-e5893ababec6c58207c8066908e21bff3d746356.zip Qt-e5893ababec6c58207c8066908e21bff3d746356.tar.gz Qt-e5893ababec6c58207c8066908e21bff3d746356.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/opengl/qgl_p.h')
| -rw-r--r-- | src/opengl/qgl_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 32feacd..ca0d3fa 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -393,6 +393,9 @@ public: uint workaround_brokenFBOReadBack : 1; uint workaroundsCached : 1; + uint workaround_brokenTextureFromPixmap : 1; + uint workaround_brokenTextureFromPixmap_init : 1; + QPaintDevice *paintDevice; QColor transpColor; QGLContext *q_ptr; |