aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2018-04-12 14:47:56 +0200
committerTopi Reiniƶ <topi.reinio@qt.io>2018-04-12 12:58:12 +0000
commit323fdf483f0021b7b3208cf2d35c0cb52248880a (patch)
tree488dc92456940101368cee8481633c748a0a9089
parent0fca0cc446c708aedc4fc5130068ad00e84f275b (diff)
Doc: Clear rest of the documentation warningsv5.11.0-beta4
Declare more windows-specific types for QDoc (Clang), and add Qt include path for the documentation build. This resolves the remaining documentation warnings. Change-Id: Ibdf23826a5e751b32ba21e762e7316d020a5e2dc Reviewed-by: Martin Smith <martin.smith@qt.io>
-rw-r--r--src/winextras/doc/qtwinextras.qdocconf3
-rw-r--r--src/winextras/qwinmime.h3
2 files changed, 5 insertions, 1 deletions
diff --git a/src/winextras/doc/qtwinextras.qdocconf b/src/winextras/doc/qtwinextras.qdocconf
index c6238f2..56262e5 100644
--- a/src/winextras/doc/qtwinextras.qdocconf
+++ b/src/winextras/doc/qtwinextras.qdocconf
@@ -12,7 +12,8 @@ examplesinstallpath = winextras
moduleheader = QtWinExtrasDoc
includepaths = -I . \
- -I ..
+ -I .. \
+ -I $QT_INSTALL_HEADERS
headerdirs = .. ../../imports/winextras
sourcedirs = .. ../../imports/winextras
diff --git a/src/winextras/qwinmime.h b/src/winextras/qwinmime.h
index 469ef30..44d7c07 100644
--- a/src/winextras/qwinmime.h
+++ b/src/winextras/qwinmime.h
@@ -54,6 +54,9 @@ class QMimeData;
#ifdef Q_CLANG_QDOC
typedef struct _FORMATETC {} FORMATETC;
typedef struct _STGMEDIUM {} STGMEDIUM;
+typedef void *HBITMAP;
+typedef void *HICON;
+typedef void *HRGN;
#endif
class Q_WINEXTRAS_EXPORT QWinMime // Keep in sync with QWindowsMime in the Windows platform plugin.