diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-14 03:01:15 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-14 03:01:16 +0200 |
| commit | 4094fa4d0862acf8e5b114c9956362c8c84b78ef (patch) | |
| tree | 287df4d89c7554155762ff4e13042fbf49439151 | |
| parent | 1eb21a6679d88ae478b7e5b770e7b9c3d0c5851e (diff) | |
| parent | fe8be8f48cf384a2f1b0f7c03a83aaa81680151b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I1e365621212c9b9a70f696b576b0b657bf0896a3
| -rw-r--r-- | src/macextras/doc/QtMacExtras/qmacextrasglobal.h | 1 | ||||
| -rw-r--r-- | src/macextras/doc/QtMacExtras/qmactoolbaritem.h | 1 | ||||
| -rw-r--r-- | src/macextras/doc/QtMacExtrasDoc | 5 | ||||
| -rw-r--r-- | src/macextras/doc/qtmacextras.qdocconf | 11 |
4 files changed, 18 insertions, 0 deletions
diff --git a/src/macextras/doc/QtMacExtras/qmacextrasglobal.h b/src/macextras/doc/QtMacExtras/qmacextrasglobal.h new file mode 100644 index 0000000..93de6b4 --- /dev/null +++ b/src/macextras/doc/QtMacExtras/qmacextrasglobal.h @@ -0,0 +1 @@ +#include "../../qmacextrasglobal.h" diff --git a/src/macextras/doc/QtMacExtras/qmactoolbaritem.h b/src/macextras/doc/QtMacExtras/qmactoolbaritem.h new file mode 100644 index 0000000..43acd61 --- /dev/null +++ b/src/macextras/doc/QtMacExtras/qmactoolbaritem.h @@ -0,0 +1 @@ +#include "../../qmactoolbaritem.h" diff --git a/src/macextras/doc/QtMacExtrasDoc b/src/macextras/doc/QtMacExtrasDoc new file mode 100644 index 0000000..b7f32c9 --- /dev/null +++ b/src/macextras/doc/QtMacExtrasDoc @@ -0,0 +1,5 @@ +#include "qmacextrasglobal.h" +#include "qmacfunctions.h" +#include "qmacpasteboardmime.h" +#include "qmactoolbar.h" +#include "qmactoolbaritem.h" diff --git a/src/macextras/doc/qtmacextras.qdocconf b/src/macextras/doc/qtmacextras.qdocconf index 39faeee..7bb599f 100644 --- a/src/macextras/doc/qtmacextras.qdocconf +++ b/src/macextras/doc/qtmacextras.qdocconf @@ -12,6 +12,17 @@ examplesinstallpath = macextras # Add a generic 'Qt Code Sample' thumbnail in Qt Creator for all examples manifestmeta.thumbnail.names += "QtMacExtras/*" +# dummy module header for clang, found under doc/ +moduleheader = QtMacExtrasDoc + +# pass include paths to clang +includepaths += -I . \ + -I .. \ + -I ./QtMacExtras \ + -I $QT_INSTALL_HEADERS + +clangdefines += Q_OS_OSX Q_OS_MACOS QT_PLATFORM_UIKIT + headerdirs += .. sourcedirs += .. imagedirs += images |