diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-25 13:40:12 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-29 10:25:51 +0200 |
| commit | 957c8fb9946643a779e0a84eeeca2f150f221cba (patch) | |
| tree | f3cd7b62c4943f1c62c6da0ff802b296ac66c88d /src/declarative/items/qsgshadereffectnode.cpp | |
| parent | f37b38e4cd4aa9e0443640a1fd73c239cab0d45e (diff) | |
Get declarative running on new gui/opengl stack.
Rename QGuiGLContext -> QOpenGLContext, QGL* -> QOpenGL*, etc.
Change-Id: I08379029d756e28b20ae141ca30ed801626b513d
Reviewed-on: http://codereview.qt.nokia.com/3711
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/declarative/items/qsgshadereffectnode.cpp')
| -rw-r--r-- | src/declarative/items/qsgshadereffectnode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/items/qsgshadereffectnode.cpp b/src/declarative/items/qsgshadereffectnode.cpp index d51317a122..c5d208345e 100644 --- a/src/declarative/items/qsgshadereffectnode.cpp +++ b/src/declarative/items/qsgshadereffectnode.cpp @@ -108,7 +108,7 @@ void QSGCustomMaterialShader::updateState(const RenderState &state, QSGMaterial } } - QGLFunctions *functions = state.context()->functions(); + QOpenGLFunctions *functions = state.context()->functions(); for (int i = material->m_textures.size() - 1; i >= 0; --i) { functions->glActiveTexture(GL_TEXTURE0 + i); if (QSGTextureProvider *provider = material->m_textures.at(i).second) { |