summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qclipboard.cpp4
-rw-r--r--src/gui/opengl/qopengltexturehelper.cpp2
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;