From 41a6877fe8ac8afde28f96e75e033f53f22939d4 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@qt.io>
Date: Mon, 15 Jan 2018 08:37:43 +0100
Subject: doc: Fix remaining qdoc warnings in platformheaders

clang needed to see so type definitions that aren't there
for some platforms, so this update provides defaults when
qdoc is running.

Change-Id: I15e635b31dd651457f828f90c8dd132959c826e6
Reviewed-by: Martin Smith <martin.smith@qt.io>
---
 .../eglfsfunctions/qeglfsfunctions.qdoc            | 45 ++++++++++++++++++++++
 .../nativecontexts/qcocoanativecontext.h           |  4 ++
 .../nativecontexts/qeglnativecontext.h             |  5 +++
 .../nativecontexts/qglxnativecontext.h             |  7 ++++
 .../nativecontexts/qglxnativecontext.qdoc          |  2 +-
 .../nativecontexts/qwglnativecontext.h             |  5 +++
 .../windowsfunctions/qwindowswindowfunctions.qdoc  |  2 +-
 7 files changed, 68 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/platformheaders/eglfsfunctions/qeglfsfunctions.qdoc b/src/platformheaders/eglfsfunctions/qeglfsfunctions.qdoc
index d458d73155..fc392ac369 100644
--- a/src/platformheaders/eglfsfunctions/qeglfsfunctions.qdoc
+++ b/src/platformheaders/eglfsfunctions/qeglfsfunctions.qdoc
@@ -95,3 +95,48 @@
     \internal
     \preliminary
 */
+
+/*!
+    \typedef QEglFSFunctions::Vsp2AddBlendListenerType
+    \internal
+*/
+
+/*!
+    \typedef QEglFSFunctions::Vsp2AddLayerType
+    \internal
+*/
+
+/*!
+    \typedef QEglFSFunctions::Vsp2RemoveLayerType
+    \internal
+*/
+
+/*!
+    \typedef QEglFSFunctions::Vsp2SetLayerBufferType
+    \internal
+*/
+
+/*!
+    \typedef QEglFSFunctions::Vsp2SetLayerPositionType
+    \internal
+*/
+
+/*! \fn QByteArray QEglFSFunctions::vsp2AddBlendListenerTypeIdentifier()
+    \internal
+ */
+
+/*! \fn QByteArray QEglFSFunctions::vsp2AddLayerTypeIdentifier()
+    \internal
+ */
+
+/*! \fn QByteArray QEglFSFunctions::vsp2RemoveLayerTypeIdentifier()
+    \internal
+ */
+
+/*! \fn QByteArray QEglFSFunctions::vsp2SetLayerBufferTypeIdentifier()
+    \internal
+ */
+
+/*! \fn QByteArray QEglFSFunctions::vsp2SetLayerPositionTypeIdentifier()
+    \internal
+ */
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:
diff --git a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc b/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc
index 9061690681..a52bbe061b 100644
--- a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc
+++ b/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc
@@ -124,7 +124,7 @@
 */
 
 /*!
-    \fn QByteArray setWindowActivationBehaviorIdentifier()
+    \fn QByteArray QWindowsWindowFunctions::setWindowActivationBehaviorIdentifier()
 
     This function returns a bytearray that can be used to query
     QGuiApplication::platformFunction() to retrieve the SetWindowActivationBehaviorType
-- 
cgit v1.2.3