diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-20 05:46:33 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-20 05:46:33 +1000 |
| commit | ac1fcae4177ca39729509b3b70ed0b766b042c1e (patch) | |
| tree | ff43ffec99221c5c27aca1827e29ab11af48e17e /src/opengl/qgl_p.h | |
| parent | c14af1c242ea3b268a4b6a5df62869bfd0efb6c4 (diff) | |
| parent | 20542f9546637bd649c928226249be0ffc91841b (diff) | |
| download | qt4-tools-ac1fcae4177ca39729509b3b70ed0b766b042c1e.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Workaround to VideoCore III scissor bug.
Diffstat (limited to 'src/opengl/qgl_p.h')
| -rw-r--r-- | src/opengl/qgl_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index c56b2db806..d76f0b042a 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -415,6 +415,8 @@ public: uint workaround_brokenTextureFromPixmap : 1; uint workaround_brokenTextureFromPixmap_init : 1; + uint workaround_brokenScissor : 1; + QPaintDevice *paintDevice; QColor transpColor; QGLContext *q_ptr; |