summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qplatformopenglcontext_qpa.cpp11
-rw-r--r--src/gui/kernel/qplatformopenglcontext_qpa.h2
2 files changed, 3 insertions, 10 deletions
diff --git a/src/gui/kernel/qplatformopenglcontext_qpa.cpp b/src/gui/kernel/qplatformopenglcontext_qpa.cpp
index 3b2ce2465b..e764419825 100644
--- a/src/gui/kernel/qplatformopenglcontext_qpa.cpp
+++ b/src/gui/kernel/qplatformopenglcontext_qpa.cpp
@@ -65,25 +65,18 @@ QT_BEGIN_NAMESPACE
which maps to the QPlatformOpenGLContext.
*/
-/*! \fn void QPlatformOpenGLContext::swapBuffers()
+/*! \fn void QPlatformOpenGLContext::swapBuffers(QPlatformSurface *surface)
Reimplement in subclass to native swap buffers calls
The implementation must support being called in a thread different than the gui-thread.
*/
-/*! \fn void *QPlatformOpenGLContext::getProcAddress(const QString &procName)
+/*! \fn QFunctionPointer QPlatformOpenGLContext::getProcAddress(const QByteArray &procName)
Reimplement in subclass to native getProcAddr calls.
Note: its convenient to use qPrintable(const QString &str) to get the const char * pointer
*/
-/*! \fn QPlatformWindowFormat QPlatformOpenGLContext::platformWindowFormat() const
- QWidget has the function qplatformWindowFormat(). That function is for the application
- programmer to request the format of the window and the context that he wants.
-
- Reimplement this function in a subclass to indicate what format the glContext actually has.
-*/
-
class QPlatformOpenGLContextPrivate
{
public:
diff --git a/src/gui/kernel/qplatformopenglcontext_qpa.h b/src/gui/kernel/qplatformopenglcontext_qpa.h
index 6fb8da25c1..fc1b404b91 100644
--- a/src/gui/kernel/qplatformopenglcontext_qpa.h
+++ b/src/gui/kernel/qplatformopenglcontext_qpa.h
@@ -68,7 +68,7 @@ public:
virtual bool makeCurrent(QPlatformSurface *surface) = 0;
virtual void doneCurrent() = 0;
- virtual void (*getProcAddress(const QByteArray &procName)) () = 0;
+ virtual QFunctionPointer getProcAddress(const QByteArray &procName) = 0;
QOpenGLContext *context() const;