summaryrefslogtreecommitdiffstats
path: root/src/platformheaders/nativecontexts
diff options
context:
space:
mode:
Diffstat (limited to 'src/platformheaders/nativecontexts')
-rw-r--r--src/platformheaders/nativecontexts/qcocoanativecontext.h4
-rw-r--r--src/platformheaders/nativecontexts/qeglnativecontext.h5
-rw-r--r--src/platformheaders/nativecontexts/qglxnativecontext.h7
-rw-r--r--src/platformheaders/nativecontexts/qglxnativecontext.qdoc2
-rw-r--r--src/platformheaders/nativecontexts/qwglnativecontext.h5
5 files changed, 22 insertions, 1 deletions
diff --git a/src/platformheaders/nativecontexts/qcocoanativecontext.h b/src/platformheaders/nativecontexts/qcocoanativecontext.h
index 16cabe1737..8227485b15 100644
--- a/src/platformheaders/nativecontexts/qcocoanativecontext.h
+++ b/src/platformheaders/nativecontexts/qcocoanativecontext.h
@@ -45,6 +45,10 @@
QT_BEGIN_NAMESPACE
+#if defined(Q_CLANG_QDOC)
+typedef void NSOpenGLContext;
+#endif
+
struct QCocoaNativeContext
{
QCocoaNativeContext()
diff --git a/src/platformheaders/nativecontexts/qeglnativecontext.h b/src/platformheaders/nativecontexts/qeglnativecontext.h
index eae74126fd..d4a0e998da 100644
--- a/src/platformheaders/nativecontexts/qeglnativecontext.h
+++ b/src/platformheaders/nativecontexts/qeglnativecontext.h
@@ -46,6 +46,11 @@
QT_BEGIN_NAMESPACE
+#if defined(Q_CLANG_QDOC)
+typedef int EGLContext;
+typedef int EGLDisplay;
+#endif
+
struct QEGLNativeContext
{
QEGLNativeContext()
diff --git a/src/platformheaders/nativecontexts/qglxnativecontext.h b/src/platformheaders/nativecontexts/qglxnativecontext.h
index 0895261fdd..2b566d127a 100644
--- a/src/platformheaders/nativecontexts/qglxnativecontext.h
+++ b/src/platformheaders/nativecontexts/qglxnativecontext.h
@@ -46,6 +46,13 @@
QT_BEGIN_NAMESPACE
+#if defined(Q_CLANG_QDOC)
+typedef int GLXContext;
+typedef void Display;
+typedef int Window;
+typedef int VisualID;
+#endif
+
struct QGLXNativeContext
{
QGLXNativeContext()
diff --git a/src/platformheaders/nativecontexts/qglxnativecontext.qdoc b/src/platformheaders/nativecontexts/qglxnativecontext.qdoc
index 64b551aeb8..56182534a5 100644
--- a/src/platformheaders/nativecontexts/qglxnativecontext.qdoc
+++ b/src/platformheaders/nativecontexts/qglxnativecontext.qdoc
@@ -77,7 +77,7 @@
*/
/*!
- \fn QGLXNativeContext::QGLXNativeContext(GLXContext ctx, Display *dpy = 0, Window wnd = 0, VisualID vid = 0)
+ \fn QGLXNativeContext::QGLXNativeContext(GLXContext ctx, Display *dpy, Window wnd, VisualID vid)
Constructs a new instance with the provided \a ctx, \a dpy, \a wnd, \a vid handles.
*/
diff --git a/src/platformheaders/nativecontexts/qwglnativecontext.h b/src/platformheaders/nativecontexts/qwglnativecontext.h
index 1c742604e6..24244b285f 100644
--- a/src/platformheaders/nativecontexts/qwglnativecontext.h
+++ b/src/platformheaders/nativecontexts/qwglnativecontext.h
@@ -46,6 +46,11 @@
QT_BEGIN_NAMESPACE
+#if defined(Q_CLANG_QDOC)
+typedef int HGLRC;
+typedef int HWND;
+#endif
+
class QWGLNativeContext
{
public: