diff options
| author | aavit <qt-info@nokia.com> | 2010-05-14 07:06:54 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-05-14 07:06:54 (GMT) |
| commit | b2e15281d56415e6ef8d4f1604d25b198d449f06 (patch) | |
| tree | f6207fd8c402b938fd20e098327f50ccb1ffc8e6 /src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h | |
| parent | ad6dafee9be288bcef6b2c4b318b234d2995abff (diff) | |
| parent | b7f4b58a94f3be8f8c2fa2f2e4acc3a05e621e92 (diff) | |
| download | Qt-b2e15281d56415e6ef8d4f1604d25b198d449f06.zip Qt-b2e15281d56415e6ef8d4f1604d25b198d449f06.tar.gz Qt-b2e15281d56415e6ef8d4f1604d25b198d449f06.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h index 6ba0c42..0a046dc 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h @@ -177,6 +177,7 @@ public: ctx(0), useSystemClip(true), elementIndicesVBOId(0), + opacityArray(0), snapToPixelGrid(false), addOffset(false), nativePaintingActive(false), |