diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-27 16:19:29 +0200 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-27 19:22:48 +0200 |
| commit | d236fe2214340164bec4f34cb27dea4a634ee0de (patch) | |
| tree | cda4ebbcc91717b37e5a2dbccb9ee46c2a1d3885 /src/gui/opengl | |
| parent | 2b17b0235b70f89d15d3b91a14c3297d38377f94 (diff) | |
| parent | cbc883da6910b3357a4e03d0e2dfa841da1a03e8 (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/global/qisenum.h
src/dbus/qdbusconnection_p.h
src/widgets/kernel/qwidget.cpp
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
Change-Id: I85102515d5fec835832cc20ffdc5c1ba578bd01d
Diffstat (limited to 'src/gui/opengl')
| -rw-r--r-- | src/gui/opengl/qopenglpaintengine_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h index 1b3dfbae28..8b49ec250f 100644 --- a/src/gui/opengl/qopenglpaintengine_p.h +++ b/src/gui/opengl/qopenglpaintengine_p.h @@ -199,7 +199,7 @@ public: void updateBrushUniforms(); void updateMatrix(); void updateCompositionMode(); - void updateTextureFilter(GLenum target, GLenum wrapMode, bool smoothPixmapTransform, GLuint id = -1); + void updateTextureFilter(GLenum target, GLenum wrapMode, bool smoothPixmapTransform, GLuint id = GLuint(-1)); void resetGLState(); |