diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-10-05 00:10:04 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-10-05 00:10:04 (GMT) |
| commit | d2eb1ed680353dc326b68119c384d0f09d4aae62 (patch) | |
| tree | cac4b62d51bd6732ab48527d71843496636a8844 /src/opengl/qgl_p.h | |
| parent | c7bf2d79f37ac302dad9a5782645bd3f465bb47d (diff) | |
| parent | c1f9978c9d61bcbdb2f280185a3abdea13d7f532 (diff) | |
| download | Qt-d2eb1ed680353dc326b68119c384d0f09d4aae62.zip Qt-d2eb1ed680353dc326b68119c384d0f09d4aae62.tar.gz Qt-d2eb1ed680353dc326b68119c384d0f09d4aae62.tar.bz2 | |
Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-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 73c0d65..78f888a 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -402,6 +402,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; |