diff options
author | Laszlo Agocs <[email protected]> | 2015-04-08 10:33:36 +0200 |
---|---|---|
committer | Rafael Roquetto <[email protected]> | 2015-04-08 16:26:20 +0000 |
commit | cd61b6c969dee74776ad7e9f3dcf1e1623b1059b (patch) | |
tree | faabcf42a34d96f67c15ebcbd387534faffd127c | |
parent | e7e580412e7375aee6dad8d1b60ae8a40d6c7207 (diff) |
Add a cast to glTexImage2D to keep QNX happy
The internalformat parameter seems to be GLenum (unsigned int) on QNX
based on the error message in the linked bug report. The standard is
GLint, though. To keep everyone happy, add a cast.
Task-number: QTBUG-45346
Change-Id: I57fece7b381e0d02acc842a21b1edc5451ea0224
Reviewed-by: Sérgio Martins <[email protected]>
Reviewed-by: Rafael Roquetto <[email protected]>
-rw-r--r-- | src/gui/opengl/qopengltexturehelper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/opengl/qopengltexturehelper.cpp b/src/gui/opengl/qopengltexturehelper.cpp index e1e3593f4f5..442fa4c22ca 100644 --- a/src/gui/opengl/qopengltexturehelper.cpp +++ b/src/gui/opengl/qopengltexturehelper.cpp @@ -171,7 +171,7 @@ QOpenGLTextureHelper::QOpenGLTextureHelper(QOpenGLContext *context) GetTexParameteriv = ::glGetTexParameteriv; GetTexParameterfv = ::glGetTexParameterfv; GetTexImage = 0; - TexImage2D = ::glTexImage2D; + TexImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(::glTexImage2D); TexImage1D = 0; TexParameteriv = ::glTexParameteriv; TexParameteri = ::glTexParameteri; |