diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-14 03:00:07 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-14 03:00:07 +0200 |
| commit | 7b267bd3858743af32c30dcbd84c0e5dc11da0ba (patch) | |
| tree | 713a6db35909e38bd7f1e6ab40b1da70ef68fea6 | |
| parent | 020e259d79cd8d05c83901061e2bb6d24e9d847e (diff) | |
| parent | 323fdf483f0021b7b3208cf2d35c0cb52248880a (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I9e0b2a584a1b507fc36386a79bc1f6aaf1b5afbe
| -rw-r--r-- | src/winextras/doc/QtWinExtras/qwinextrasglobal.h | 1 | ||||
| -rw-r--r-- | src/winextras/doc/QtWinExtrasDoc | 22 | ||||
| -rw-r--r-- | src/winextras/doc/qtwinextras.qdocconf | 6 | ||||
| -rw-r--r-- | src/winextras/qwinmime.h | 8 |
4 files changed, 37 insertions, 0 deletions
diff --git a/src/winextras/doc/QtWinExtras/qwinextrasglobal.h b/src/winextras/doc/QtWinExtras/qwinextrasglobal.h new file mode 100644 index 0000000..2da776f --- /dev/null +++ b/src/winextras/doc/QtWinExtras/qwinextrasglobal.h @@ -0,0 +1 @@ +#include "../../qwinextrasglobal.h" diff --git a/src/winextras/doc/QtWinExtrasDoc b/src/winextras/doc/QtWinExtrasDoc new file mode 100644 index 0000000..7d14c34 --- /dev/null +++ b/src/winextras/doc/QtWinExtrasDoc @@ -0,0 +1,22 @@ +#include "qwinevent.h" +#include "qwinjumplist_p.h" +#include "winpropkey_p.h" +#include "qwinfunctions_p.h" +#include "qwineventfilter_p.h" +#include "winshobjidl_p.h" +#include "qwintaskbarbutton.h" +#include "qwinmime.h" +#include "qwinextrasglobal.h" +#include "qwinthumbnailtoolbar.h" +#include "qwinthumbnailtoolbutton_p.h" +#include "qwinjumplistitem.h" +#include "qwinjumplist.h" +#include "qwinthumbnailtoolbar_p.h" +#include "qwinjumplistitem_p.h" +#include "windowsguidsdefs_p.h" +#include "qwinfunctions.h" +#include "qwinjumplistcategory_p.h" +#include "qwintaskbarbutton_p.h" +#include "qwinthumbnailtoolbutton.h" +#include "qwintaskbarprogress.h" +#include "qwinjumplistcategory.h" diff --git a/src/winextras/doc/qtwinextras.qdocconf b/src/winextras/doc/qtwinextras.qdocconf index 27b991a..56262e5 100644 --- a/src/winextras/doc/qtwinextras.qdocconf +++ b/src/winextras/doc/qtwinextras.qdocconf @@ -9,6 +9,12 @@ exampledirs += ../../../examples/winextras \ examplesinstallpath = winextras +moduleheader = QtWinExtrasDoc + +includepaths = -I . \ + -I .. \ + -I $QT_INSTALL_HEADERS + headerdirs = .. ../../imports/winextras sourcedirs = .. ../../imports/winextras imagedirs += images diff --git a/src/winextras/qwinmime.h b/src/winextras/qwinmime.h index ff20dd3..44d7c07 100644 --- a/src/winextras/qwinmime.h +++ b/src/winextras/qwinmime.h @@ -51,6 +51,14 @@ QT_BEGIN_NAMESPACE 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. { Q_DISABLE_COPY(QWinMime) |