diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 14:06:47 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-04-15 15:53:16 +0000 |
| commit | f98d125b2928d0784d509c8025271fca661ea270 (patch) | |
| tree | 214aa16bf1782a8819b1d7fd801ab9c62af4cae1 /src/gui | |
| parent | c09ff1dbcb50d77b64e47b333fd1ee2f4c6510e7 (diff) | |
| parent | 605617b5dce6ccd8826d07aabe2db781ae3aa9b4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qclipboard.cpp | 4 | ||||
| -rw-r--r-- | src/gui/opengl/qopengltexturehelper.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp index 35e74946ee..402f5005fd 100644 --- a/src/gui/kernel/qclipboard.cpp +++ b/src/gui/kernel/qclipboard.cpp @@ -584,6 +584,6 @@ void QClipboard::emitChanged(Mode mode) emit changed(mode); } -#endif // QT_NO_CLIPBOARD - QT_END_NAMESPACE + +#endif // QT_NO_CLIPBOARD diff --git a/src/gui/opengl/qopengltexturehelper.cpp b/src/gui/opengl/qopengltexturehelper.cpp index 3635a7dd1b..440fdad081 100644 --- a/src/gui/opengl/qopengltexturehelper.cpp +++ b/src/gui/opengl/qopengltexturehelper.cpp @@ -179,7 +179,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; |