diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2012-06-12 10:21:37 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-18 21:58:30 +0200 |
| commit | 95427b0f40857c42ccf87e66d7bbf6fd2cc3ab83 (patch) | |
| tree | 4086aeb2c3bda09f8286b804771f01455b2bf518 /src/gui/opengl/qopenglfunctions.h | |
| parent | 7967cb4f4860df436dc2e7e21c4eaca6a9b05f70 (diff) | |
Fixed QOpenGLFunctions API.
We don't use the GL short term in the new API.
Change-Id: I73a51f65f5f4216c1763b95dcddf68fe8fc229d1
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui/opengl/qopenglfunctions.h')
| -rw-r--r-- | src/gui/opengl/qopenglfunctions.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index 87029849e3..fc55a6b384 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -224,7 +224,11 @@ public: QOpenGLFunctions::OpenGLFeatures openGLFeatures() const; bool hasOpenGLFeature(QOpenGLFunctions::OpenGLFeature feature) const; - void initializeGLFunctions(); + void initializeOpenGLFunctions(); + +#if QT_DEPRECATED_SINCE(5, 0) + QT_DEPRECATED void initializeGLFunctions() { initializeOpenGLFunctions(); } +#endif void glActiveTexture(GLenum texture); void glAttachShader(GLuint program, GLuint shader); |