diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-31 03:00:32 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-31 03:00:32 +0200 |
| commit | df0baaa6c58c725617edf131e3ad849efe2acc53 (patch) | |
| tree | 605c70cdfdbc86e19ac0fa550c4e6516d50ac587 | |
| parent | 11dd5b60b278dacd630aed523fc4fcbc7fe2ffc7 (diff) | |
| parent | ff771b7d57eb3654f6321eb105129a594ec2841e (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I11e12f4be032d0fcdad80ca4d8586f0c07caf99e
| -rw-r--r-- | src/imports/qtcanvas3d/canvas3dcommon_p.h | 5 | ||||
| -rw-r--r-- | src/imports/qtcanvas3d/canvasrenderer.cpp | 4 | ||||
| -rw-r--r-- | src/imports/qtcanvas3d/doc/QtCanvas3D | 1 | ||||
| -rw-r--r-- | src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf | 4 | ||||
| -rw-r--r-- | src/imports/qtcanvas3d/renderjob.cpp | 2 |
5 files changed, 16 insertions, 0 deletions
diff --git a/src/imports/qtcanvas3d/canvas3dcommon_p.h b/src/imports/qtcanvas3d/canvas3dcommon_p.h index aef2794..8afeed8 100644 --- a/src/imports/qtcanvas3d/canvas3dcommon_p.h +++ b/src/imports/qtcanvas3d/canvas3dcommon_p.h @@ -54,7 +54,12 @@ #define VERBOSE_ALL_TYPED_ARRAY_CALLS false +#ifdef Q_CLANG_QDOC +#define QT_CANVAS3D_BEGIN_NAMESPACE +#define QT_CANVAS3D_END_NAMESPACE +#else #define QT_CANVAS3D_BEGIN_NAMESPACE namespace QtCanvas3D { #define QT_CANVAS3D_END_NAMESPACE } +#endif // Q_CLANG_QDOC #endif // CANVAS3DCOMMON_P_H diff --git a/src/imports/qtcanvas3d/canvasrenderer.cpp b/src/imports/qtcanvas3d/canvasrenderer.cpp index 95f77ad..fbeea40 100644 --- a/src/imports/qtcanvas3d/canvasrenderer.cpp +++ b/src/imports/qtcanvas3d/canvasrenderer.cpp @@ -57,6 +57,10 @@ QT_CANVAS3D_BEGIN_NAMESPACE const int initialQueueSize = 256; const int maxQueueSize = 1000000; +/*! + \class CanvasRenderer + \internal +*/ CanvasRenderer::CanvasRenderer(QObject *parent): QObject(parent), m_fboSize(0, 0), diff --git a/src/imports/qtcanvas3d/doc/QtCanvas3D b/src/imports/qtcanvas3d/doc/QtCanvas3D new file mode 100644 index 0000000..1f53060 --- /dev/null +++ b/src/imports/qtcanvas3d/doc/QtCanvas3D @@ -0,0 +1 @@ +#include "../canvas3dcommon_p.h" diff --git a/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf b/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf index 7314191..e47f829 100644 --- a/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf +++ b/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf @@ -4,6 +4,10 @@ project = QtCanvas3D description = Qt Canvas 3D Reference Documentation version = $QT_VERSION +# Qt Canvas 3D doesn't expose a C++ API - pass a dummy header for Clang parser +moduleheader = QtCanvas3D +includepaths = . + exampledirs = ../../../../examples/canvas3d \ snippets diff --git a/src/imports/qtcanvas3d/renderjob.cpp b/src/imports/qtcanvas3d/renderjob.cpp index 78be04f..10ade40 100644 --- a/src/imports/qtcanvas3d/renderjob.cpp +++ b/src/imports/qtcanvas3d/renderjob.cpp @@ -47,6 +47,8 @@ QT_BEGIN_NAMESPACE QT_CANVAS3D_BEGIN_NAMESPACE /*! + * \class CanvasRenderJob + * \internal * The CanvasRenderJob class is for synchronous render jobs used by QtCanvas3D. * It takes care of synchronization. */ |