Doc: Specify #include path for each \class

QDoc tries to guess the correct #include statement, displayed in
the requisites table in the class reference. However, this often
produces incorrect information for a module as complex as Qt3D.

To fix this, manually specify the include path with the \inheaderfile
command.

Change-Id: I42929b92600d07d759f4f76e9051ff656785c652
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

58 files changed, 62 insertions, 0 deletions

diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index 13195a798..c049d3503 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -87,6 +87,7 @@ void QAbstractAspectPrivate::unregisterBackendType(const QMetaObject &mo)
 
 /*!
  * \class Qt3DCore::QAbstractAspect
+ * \inheaderfile Qt3DCore/QAbstractAspect
  * \inherits QObject
  * \inmodule Qt3DCore
  * \brief QAbstractAspect is the base class for aspects that provide a vertical slice of behavior.
diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp
index 81ee707bd..15f975332 100644
--- a/src/core/aspects/qaspectengine.cpp
+++ b/src/core/aspects/qaspectengine.cpp
@@ -124,6 +124,7 @@ void QAspectEnginePrivate::generateCreationChanges(QNode *root)
 
 /*!
  * \class Qt3DCore::QAspectEngine
+ * \inheaderfile Qt3DCore/QAspectEngine
  * \inherits QObject
  * \inmodule Qt3DCore
  *
diff --git a/src/core/changes/qcomponentaddedchange.cpp b/src/core/changes/qcomponentaddedchange.cpp
index 1ad25651b..8d7ce425a 100644
--- a/src/core/changes/qcomponentaddedchange.cpp
+++ b/src/core/changes/qcomponentaddedchange.cpp
@@ -57,6 +57,7 @@ QComponentAddedChangePrivate::QComponentAddedChangePrivate(const QEntity *entity
 
 /*!
  * \class Qt3DCore::QComponentAddedChange
+ * \inheaderfile Qt3DCore/QComponentAddedChange
  * \inherits Qt3DCore::QSceneChange
  * \inmodule Qt3DCore
  * \brief The QComponentAddedChange class is used to notify when a component is added to an entity
diff --git a/src/core/changes/qcomponentremovedchange.cpp b/src/core/changes/qcomponentremovedchange.cpp
index e1625ac93..5b5ef247a 100644
--- a/src/core/changes/qcomponentremovedchange.cpp
+++ b/src/core/changes/qcomponentremovedchange.cpp
@@ -57,6 +57,7 @@ QComponentRemovedChangePrivate::QComponentRemovedChangePrivate(const QEntity *en
 
 /*!
  * \class Qt3DCore::QComponentRemovedChange
+ * \inheaderfile Qt3DCore/QComponentRemovedChange
  * \inherits Qt3DCore::QSceneChange
  * \inmodule Qt3DCore
  * \brief The QComponentRemovedChange class is used to notify when a component is removed from an entity
diff --git a/src/core/changes/qdynamicpropertyupdatedchange.cpp b/src/core/changes/qdynamicpropertyupdatedchange.cpp
index 3931d942c..fd174097c 100644
--- a/src/core/changes/qdynamicpropertyupdatedchange.cpp
+++ b/src/core/changes/qdynamicpropertyupdatedchange.cpp
@@ -55,6 +55,7 @@ QDynamicPropertyUpdatedChangePrivate::~QDynamicPropertyUpdatedChangePrivate()
 
 /*!
  * \class Qt3DCore::QDynamicPropertyUpdatedChange
+ * \inheaderfile Qt3DCore/QDynamicPropertyUpdatedChange
  * \inherits Qt3DCore::QPropertyUpdatedChangeBase
  * \inmodule Qt3DCore
  * \brief The QDynamicPropertyUpdatedChange class is used to notify when a dynamic property value is updated
diff --git a/src/core/changes/qnodecreatedchange.cpp b/src/core/changes/qnodecreatedchange.cpp
index 06e85fbfc..a77721cdc 100644
--- a/src/core/changes/qnodecreatedchange.cpp
+++ b/src/core/changes/qnodecreatedchange.cpp
@@ -53,6 +53,7 @@ QNodeCreatedChangeBasePrivate::QNodeCreatedChangeBasePrivate(const QNode *node)
 
 /*!
  * \class Qt3DCore::QNodeCreatedChangeBase
+ * \inheaderfile Qt3DCore/QNodeCreatedChangeBase
  * \inherits Qt3DCore::QSceneChange
  * \inmodule Qt3DCore
  * \brief The QNodeCreatedChangeBase class is the base class for all NodeCreated QSceneChange events
@@ -120,6 +121,7 @@ bool QNodeCreatedChangeBase::isNodeEnabled() const Q_DECL_NOTHROW
 
 /*!
  * \class Qt3DCore::QNodeCreatedChange
+ * \inheaderfile Qt3DCore/QNodeCreatedChange
  * \inherits Qt3DCore::QNodeCreatedChangeBase
  * \since 5.7
  * \inmodule Qt3DCore
diff --git a/src/core/changes/qnodedestroyedchange.cpp b/src/core/changes/qnodedestroyedchange.cpp
index 96403f237..2d304dcbc 100644
--- a/src/core/changes/qnodedestroyedchange.cpp
+++ b/src/core/changes/qnodedestroyedchange.cpp
@@ -43,6 +43,7 @@ namespace Qt3DCore {
 
 /*!
  * \class Qt3DCore::QNodeDestroyedChange
+ * \inheaderfile Qt3DCore/QNodeDestroyedChange
  * \inherits Qt3DCore::QSceneChange
  * \since 5.7
  * \inmodule Qt3DCore
diff --git a/src/core/changes/qpropertynodeaddedchange.cpp b/src/core/changes/qpropertynodeaddedchange.cpp
index 539c6a54a..e159276dd 100644
--- a/src/core/changes/qpropertynodeaddedchange.cpp
+++ b/src/core/changes/qpropertynodeaddedchange.cpp
@@ -53,6 +53,7 @@ QPropertyNodeAddedChangePrivate::QPropertyNodeAddedChangePrivate()
 
 /*!
  * \class Qt3DCore::QPropertyNodeAddedChange
+ * \inheaderfile Qt3DCore/QPropertyNodeAddedChange
  * \inherits Qt3DCore::QStaticPropertyValueAddedChangeBase
  * \inmodule Qt3DCore
  * \brief Used to notify when a node is added to a property
diff --git a/src/core/changes/qpropertynoderemovedchange.cpp b/src/core/changes/qpropertynoderemovedchange.cpp
index af08635e4..a7b4e95f3 100644
--- a/src/core/changes/qpropertynoderemovedchange.cpp
+++ b/src/core/changes/qpropertynoderemovedchange.cpp
@@ -54,6 +54,7 @@ QPropertyNodeRemovedChangePrivate::QPropertyNodeRemovedChangePrivate()
 
 /*!
  * \class Qt3DCore::QPropertyNodeRemovedChange
+ * \inheaderfile Qt3DCore/QPropertyNodeRemovedChange
  * \inherits Qt3DCore::QStaticPropertyValueRemovedChangeBase
  * \inmodule Qt3DCore
  * \brief The QPropertyNodeRemovedChange class is used to notify when a node is removed from a property
diff --git a/src/core/changes/qpropertyupdatedchange.cpp b/src/core/changes/qpropertyupdatedchange.cpp
index 66e7461b9..c6025efbc 100644
--- a/src/core/changes/qpropertyupdatedchange.cpp
+++ b/src/core/changes/qpropertyupdatedchange.cpp
@@ -55,6 +55,7 @@ QPropertyUpdatedChangePrivate::~QPropertyUpdatedChangePrivate()
 
 /*!
  * \class Qt3DCore::QPropertyUpdatedChange
+ * \inheaderfile Qt3DCore/QPropertyUpdatedChange
  * \inherits Qt3DCore::QStaticPropertyUpdatedChangeBase
  * \inmodule Qt3DCore
  * \brief The QPropertyUpdatedChange class is used to notify when a property value is updated
diff --git a/src/core/changes/qpropertyupdatedchangebase.cpp b/src/core/changes/qpropertyupdatedchangebase.cpp
index ab278c3f4..18f2039fc 100644
--- a/src/core/changes/qpropertyupdatedchangebase.cpp
+++ b/src/core/changes/qpropertyupdatedchangebase.cpp
@@ -55,6 +55,7 @@ QPropertyUpdatedChangeBasePrivate::~QPropertyUpdatedChangeBasePrivate()
 
 /*!
  * \class Qt3DCore::QPropertyUpdatedChangeBase
+ * \inheaderfile Qt3DCore/QPropertyUpdatedChangeBase
  * \inmodule Qt3DCore
  * \brief The QPropertyUpdatedChangeBase class is the base class for all PropertyUpdated QSceneChange events
  *
diff --git a/src/core/changes/qpropertyvalueaddedchange.cpp b/src/core/changes/qpropertyvalueaddedchange.cpp
index 3c1fb7c62..b7438fcbe 100644
--- a/src/core/changes/qpropertyvalueaddedchange.cpp
+++ b/src/core/changes/qpropertyvalueaddedchange.cpp
@@ -52,6 +52,7 @@ QPropertyValueAddedChangePrivate::QPropertyValueAddedChangePrivate()
 
 /*!
  * \class Qt3DCore::QPropertyValueAddedChange
+ * \inheaderfile Qt3DCore/QPropertyValueAddedChange
  * \inherits Qt3DCore::QStaticPropertyValueAddedChangeBase
  * \inmodule Qt3DCore
  * \brief Used to notify when a value is added to a property
diff --git a/src/core/changes/qpropertyvalueaddedchangebase.cpp b/src/core/changes/qpropertyvalueaddedchangebase.cpp
index cff918d80..26dcd5555 100644
--- a/src/core/changes/qpropertyvalueaddedchangebase.cpp
+++ b/src/core/changes/qpropertyvalueaddedchangebase.cpp
@@ -55,6 +55,7 @@ QPropertyValueAddedChangeBasePrivate::~QPropertyValueAddedChangeBasePrivate()
 
 /*!
  * \class Qt3DCore::QPropertyValueAddedChangeBase
+ * \inheaderfile Qt3DCore/QPropertyValueAddedChangeBase
  * \inmodule Qt3DCore
  * \brief The QPropertyValueAddedChangeBase class is the base class for all PropertyValueAdded QSceneChange events
  *
diff --git a/src/core/changes/qpropertyvalueremovedchange.cpp b/src/core/changes/qpropertyvalueremovedchange.cpp
index 2512e4785..6e8a1f817 100644
--- a/src/core/changes/qpropertyvalueremovedchange.cpp
+++ b/src/core/changes/qpropertyvalueremovedchange.cpp
@@ -52,6 +52,7 @@ QPropertyValueRemovedChangePrivate::QPropertyValueRemovedChangePrivate()
 
 /*!
  * \class Qt3DCore::QPropertyValueRemovedChange
+ * \inheaderfile Qt3DCore/QPropertyValueRemovedChange
  * \inherits Qt3DCore::QStaticPropertyValueRemovedChangeBase
  * \inmodule Qt3DCore
  * \brief Used to notify when a value is added to a property
diff --git a/src/core/changes/qpropertyvalueremovedchangebase.cpp b/src/core/changes/qpropertyvalueremovedchangebase.cpp
index 0a62c43c8..8115d6e22 100644
--- a/src/core/changes/qpropertyvalueremovedchangebase.cpp
+++ b/src/core/changes/qpropertyvalueremovedchangebase.cpp
@@ -55,6 +55,7 @@ QPropertyValueRemovedChangeBasePrivate::~QPropertyValueRemovedChangeBasePrivate(
 
 /*!
  * \class Qt3DCore::QPropertyValueRemovedChangeBase
+ * \inheaderfile Qt3DCore/QPropertyValueRemovedChangeBase
  * \inmodule Qt3DCore
  * \brief The QPropertyValueRemovedChangeBase class is the base class for all PropertyValueRemoved QSceneChange events
  *
diff --git a/src/core/changes/qscenechange.cpp b/src/core/changes/qscenechange.cpp
index 311c26340..959518904 100644
--- a/src/core/changes/qscenechange.cpp
+++ b/src/core/changes/qscenechange.cpp
@@ -74,6 +74,7 @@ QSceneChangePrivate::~QSceneChangePrivate()
 
 /*!
  * \class Qt3DCore::QSceneChange
+ * \inheaderfile Qt3DCore/QSceneChange
  * \inmodule Qt3DCore
  * \brief The base class for changes that can be sent and received by Qt3D's change notification system
  */
diff --git a/src/core/changes/qstaticpropertyupdatedchangebase.cpp b/src/core/changes/qstaticpropertyupdatedchangebase.cpp
index 887e9d799..409d80add 100644
--- a/src/core/changes/qstaticpropertyupdatedchangebase.cpp
+++ b/src/core/changes/qstaticpropertyupdatedchangebase.cpp
@@ -57,6 +57,7 @@ QStaticPropertyUpdatedChangeBasePrivate::~QStaticPropertyUpdatedChangeBasePrivat
 
 /*!
  * \class Qt3DCore::QStaticPropertyUpdatedChangeBase
+ * \inheaderfile Qt3DCore/QStaticPropertyUpdatedChangeBase
  * \inmodule Qt3DCore
  * \since 5.7
  * \brief The QStaticPropertyUpdatedChangeBase class is the base class for all static PropertyUpdated QSceneChange events
diff --git a/src/core/changes/qstaticpropertyvalueaddedchangebase.cpp b/src/core/changes/qstaticpropertyvalueaddedchangebase.cpp
index f79372040..4fb658459 100644
--- a/src/core/changes/qstaticpropertyvalueaddedchangebase.cpp
+++ b/src/core/changes/qstaticpropertyvalueaddedchangebase.cpp
@@ -52,6 +52,7 @@ QStaticPropertyValueAddedChangeBasePrivate::QStaticPropertyValueAddedChangeBaseP
 
 /*!
  * \class Qt3DCore::QStaticPropertyValueAddedChangeBase
+ * \inheaderfile Qt3DCore/QStaticPropertyValueAddedChangeBase
  * \inmodule Qt3DCore
  * \since 5.7
  * \brief The QStaticPropertyValueAddedChangeBase class is the base class for all static PropertyValueAdded QSceneChange events
diff --git a/src/core/changes/qstaticpropertyvalueremovedchangebase.cpp b/src/core/changes/qstaticpropertyvalueremovedchangebase.cpp
index 44fa89a36..622eb6524 100644
--- a/src/core/changes/qstaticpropertyvalueremovedchangebase.cpp
+++ b/src/core/changes/qstaticpropertyvalueremovedchangebase.cpp
@@ -52,6 +52,7 @@ QStaticPropertyValueRemovedChangeBasePrivate::QStaticPropertyValueRemovedChangeB
 
 /*!
  * \class Qt3DCore::QStaticPropertyValueRemovedChangeBase
+ * \inheaderfile Qt3DCore/QStaticPropertyValueRemovedChangeBase
  * \inmodule Qt3DCore
  * \since 5.7
  * \brief The QStaticPropertyValueRemovedChangeBase class is the base class for all static PropertyValueRemoved QSceneChange events
diff --git a/src/core/jobs/qaspectjob.cpp b/src/core/jobs/qaspectjob.cpp
index 94a747867..59f48e9bf 100644
--- a/src/core/jobs/qaspectjob.cpp
+++ b/src/core/jobs/qaspectjob.cpp
@@ -70,6 +70,7 @@ QAspectJob::QAspectJob()
 
 /*!
  * \class Qt3DCore::QAspectJob
+ * \inheaderfile Qt3DCore/QAspectJob
  * \inmodule Qt3DCore
  * \brief The base class for jobs executed in an aspect
  */
diff --git a/src/core/nodes/qabstractnodefactory.cpp b/src/core/nodes/qabstractnodefactory.cpp
index 2bd39f333..41d82cf38 100644
--- a/src/core/nodes/qabstractnodefactory.cpp
+++ b/src/core/nodes/qabstractnodefactory.cpp
@@ -45,6 +45,7 @@ namespace Qt3DCore {
 
 /*!
  * \class Qt3DCore::QAbstractNodeFactory
+ * \inheaderfile Qt3DCore/QAbstractNodeFactory
  * \inmodule Qt3DCore
  *
  * TODO
diff --git a/src/core/nodes/qbackendnode.cpp b/src/core/nodes/qbackendnode.cpp
index d8289df63..6970794b8 100644
--- a/src/core/nodes/qbackendnode.cpp
+++ b/src/core/nodes/qbackendnode.cpp
@@ -94,6 +94,7 @@ QBackendNodePrivate *QBackendNodePrivate::get(QBackendNode *n)
 
 /*!
  * \class Qt3DCore::QBackendNodeMapper
+ * \inheaderfile Qt3DCore/QBackendNodeMapper
  * \inmodule Qt3DCore
  *
  * \brief Creates and maps backend nodes to their respective frontend nodes
@@ -123,6 +124,7 @@ QBackendNodePrivate *QBackendNodePrivate::get(QBackendNode *n)
 
 /*!
  * \class Qt3DCore::QBackendNode
+ * \inheaderfile Qt3DCore/QBackendNode
  * \inmodule Qt3DCore
  *
  * \brief The base class for all Qt3D backend nodes
diff --git a/src/core/nodes/qnodeid.cpp b/src/core/nodes/qnodeid.cpp
index dee5d4ff4..f41627734 100644
--- a/src/core/nodes/qnodeid.cpp
+++ b/src/core/nodes/qnodeid.cpp
@@ -45,6 +45,7 @@ namespace Qt3DCore {
 
 /*!
  * \class Qt3DCore::QNodeId
+ * \inheaderfile Qt3DCore/QNodeId
  * \inmodule Qt3DCore
  * \brief Uniquely identifies a QNode
  */
diff --git a/src/core/transforms/qtransform.cpp b/src/core/transforms/qtransform.cpp
index 85fe7f9f1..a765b8096 100644
--- a/src/core/transforms/qtransform.cpp
+++ b/src/core/transforms/qtransform.cpp
@@ -169,6 +169,7 @@ QTransformPrivate::~QTransformPrivate()
 
 /*!
  * \class Qt3DCore::QTransform
+ * \inheaderfile Qt3DCore/QTransform
  * \inmodule Qt3DCore
  * \inherits Qt3DCore::QComponent
  * \since 5.6
diff --git a/src/extras/defaults/qskyboxentity.cpp b/src/extras/defaults/qskyboxentity.cpp
index 85f01340d..e81c6ad91 100644
--- a/src/extras/defaults/qskyboxentity.cpp
+++ b/src/extras/defaults/qskyboxentity.cpp
@@ -188,6 +188,7 @@ void QSkyboxEntityPrivate::reloadTexture()
 
 /*!
  * \class Qt3DExtras::QSkyboxEntity
+ * \inheaderfile Qt3DExtras/QSkyboxEntity
  * \inmodule Qt3DExtras
  *
  * \brief Qt3DExtras::QSkyboxEntity is a convenience Qt3DCore::QEntity subclass that can
diff --git a/src/extras/geometries/qconegeometry.cpp b/src/extras/geometries/qconegeometry.cpp
index 8159564ae..a86d10f6b 100644
--- a/src/extras/geometries/qconegeometry.cpp
+++ b/src/extras/geometries/qconegeometry.cpp
@@ -39,6 +39,7 @@
 
 /*!
  * \class Qt3DExtras::QConeGeometry
+ * \inheaderfile Qt3DExtras/QConeGeometry
  * \inmodule Qt3DExtras
  * \brief The QConeGeometry class allows creation of a cone in 3D space.
  * \since 5.7
diff --git a/src/extras/geometries/qconemesh.cpp b/src/extras/geometries/qconemesh.cpp
index 385c469e0..8baa19217 100644
--- a/src/extras/geometries/qconemesh.cpp
+++ b/src/extras/geometries/qconemesh.cpp
@@ -104,6 +104,7 @@ namespace Qt3DExtras {
 
 /*!
  * \class Qt3DExtras::QConeMesh
+ * \inheaderfile Qt3DExtras/QConeMesh
  * \inmodule Qt3DExtras
  *
  * \inherits Qt3DRender::QGeometryRenderer
diff --git a/src/extras/geometries/qcuboidgeometry.cpp b/src/extras/geometries/qcuboidgeometry.cpp
index 0f7b5220f..28743858a 100644
--- a/src/extras/geometries/qcuboidgeometry.cpp
+++ b/src/extras/geometries/qcuboidgeometry.cpp
@@ -645,6 +645,7 @@ void QCuboidGeometryPrivate::init()
 
 /*!
  * \class Qt3DExtras::QCuboidGeometry
+ * \inheaderfile Qt3DExtras/QCuboidGeometry
  * \inmodule Qt3DExtras
  * \brief The QCuboidGeometry class allows creation of a cuboid in 3D space.
  * \since 5.7
diff --git a/src/extras/geometries/qcuboidmesh.cpp b/src/extras/geometries/qcuboidmesh.cpp
index 7df77ec63..88c735746 100644
--- a/src/extras/geometries/qcuboidmesh.cpp
+++ b/src/extras/geometries/qcuboidmesh.cpp
@@ -95,6 +95,7 @@ namespace  Qt3DExtras {
 
 /*!
  * \class Qt3DExtras::QCuboidMesh
+ * \inheaderfile Qt3DExtras/QCuboidMesh
  * \inmodule Qt3DExtras
  *
  * \inherits Qt3DRender::QGeometryRenderer
diff --git a/src/extras/geometries/qcylindergeometry.cpp b/src/extras/geometries/qcylindergeometry.cpp
index f37fd0ddf..29f7ea7e0 100644
--- a/src/extras/geometries/qcylindergeometry.cpp
+++ b/src/extras/geometries/qcylindergeometry.cpp
@@ -406,6 +406,7 @@ void QCylinderGeometryPrivate::init()
 
 /*!
  * \class Qt3DExtras::QCylinderGeometry
+ * \inheaderfile Qt3DExtras/QCylinderGeometry
  * \inmodule Qt3DExtras
  * \brief The QCylinderGeometry class allows creation of a cylinder in 3D space.
  * \since 5.7
diff --git a/src/extras/geometries/qcylindermesh.cpp b/src/extras/geometries/qcylindermesh.cpp
index 875d8ed9a..9b0ded28b 100644
--- a/src/extras/geometries/qcylindermesh.cpp
+++ b/src/extras/geometries/qcylindermesh.cpp
@@ -89,6 +89,7 @@ namespace Qt3DExtras {
 
 /*!
  * \class Qt3DExtras::QCylinderMesh
+ * \inheaderfile Qt3DExtras/QCylinderMesh
  * \inmodule Qt3DExtras
  *
  * \inherits Qt3DRender::QGeometryRenderer
diff --git a/src/extras/geometries/qplanegeometry.cpp b/src/extras/geometries/qplanegeometry.cpp
index 74c90cf1b..16b401d3d 100644
--- a/src/extras/geometries/qplanegeometry.cpp
+++ b/src/extras/geometries/qplanegeometry.cpp
@@ -266,6 +266,7 @@ public:
 
 /*!
  * \class Qt3DExtras::QPlaneGeometry
+ * \inheaderfile Qt3DExtras/QPlaneGeometry
  * \inmodule Qt3DExtras
  * \brief The QPlaneGeometry class allows creation of a plane in 3D space.
  * \since 5.7
diff --git a/src/extras/geometries/qplanemesh.cpp b/src/extras/geometries/qplanemesh.cpp
index f14d7cb97..120aed6df 100644
--- a/src/extras/geometries/qplanemesh.cpp
+++ b/src/extras/geometries/qplanemesh.cpp
@@ -73,6 +73,7 @@ namespace  Qt3DExtras {
 
 /*!
  * \class Qt3DExtras::QPlaneMesh
+ * \inheaderfile Qt3DExtras/QPlaneMesh
  * \inmodule Qt3DExtras
  *
  * \inherits Qt3DRender::QGeometryRenderer
diff --git a/src/extras/geometries/qspheregeometry.cpp b/src/extras/geometries/qspheregeometry.cpp
index 277d4fcb9..a79eb8074 100644
--- a/src/extras/geometries/qspheregeometry.cpp
+++ b/src/extras/geometries/qspheregeometry.cpp
@@ -380,6 +380,7 @@ void QSphereGeometryPrivate::init()
 
 /*!
  * \class Qt3DExtras::QSphereGeometry
+ * \inheaderfile Qt3DExtras/QSphereGeometry
  * \inmodule Qt3DExtras
  * \brief The QSphereGeometry class allows creation of a sphere in 3D space.
  * \since 5.7
diff --git a/src/extras/geometries/qspheremesh.cpp b/src/extras/geometries/qspheremesh.cpp
index 90cf5a872..988a95990 100644
--- a/src/extras/geometries/qspheremesh.cpp
+++ b/src/extras/geometries/qspheremesh.cpp
@@ -79,6 +79,7 @@ namespace  Qt3DExtras {
 
 /*!
  * \class Qt3DExtras::QSphereMesh
+ * \inheaderfile Qt3DExtras/QSphereMesh
  * \inmodule Qt3DExtras
  *
  * \inherits Qt3DRender::QGeometryRenderer
diff --git a/src/extras/geometries/qtorusgeometry.cpp b/src/extras/geometries/qtorusgeometry.cpp
index 843979b6d..08afce1b0 100644
--- a/src/extras/geometries/qtorusgeometry.cpp
+++ b/src/extras/geometries/qtorusgeometry.cpp
@@ -360,6 +360,7 @@ void QTorusGeometryPrivate::init()
 
 /*!
  * \class Qt3DExtras::QTorusGeometry
+ * \inheaderfile Qt3DExtras/QTorusGeometry
  * \inmodule Qt3DExtras
  * \brief The QTorusGeometry class allows creation of a torus in 3D space.
  * \since 5.7
diff --git a/src/extras/geometries/qtorusmesh.cpp b/src/extras/geometries/qtorusmesh.cpp
index a77631b73..96fce9ec0 100644
--- a/src/extras/geometries/qtorusmesh.cpp
+++ b/src/extras/geometries/qtorusmesh.cpp
@@ -82,6 +82,7 @@ namespace  Qt3DExtras {
 
 /*!
  * \class Qt3DExtras::QTorusMesh
+ * \inheaderfile Qt3DExtras/QTorusMesh
  * \inmodule Qt3DExtras
  *
  * \inherits Qt3DRender::QGeometryRenderer
diff --git a/src/input/frontend/qabstractaxisinput.cpp b/src/input/frontend/qabstractaxisinput.cpp
index 46d889cb4..bcce50a33 100644
--- a/src/input/frontend/qabstractaxisinput.cpp
+++ b/src/input/frontend/qabstractaxisinput.cpp
@@ -55,6 +55,7 @@ namespace Qt3DInput {
 
 /*!
  * \class Qt3DInput::QAbstractAxisInput
+ * \inheaderfile Qt3DInput/QAbstractAxisInput
  * \inmodule Qt3DInput
  * \brief QAbstractActionInput is the base class for all Axis Input.
  * \since 5.5
diff --git a/src/input/frontend/qanalogaxisinput.cpp b/src/input/frontend/qanalogaxisinput.cpp
index 2486072b8..6d50af45c 100644
--- a/src/input/frontend/qanalogaxisinput.cpp
+++ b/src/input/frontend/qanalogaxisinput.cpp
@@ -57,6 +57,7 @@ namespace Qt3DInput {
 
 /*!
  * \class Qt3DInput::QAnalogAxisInput
+ * \inheaderfile Qt3DInput/QAnalogAxisInput
  * \inmodule Qt3DInput
  * \brief An axis input controlled by an analog input
  * \since 5.7
diff --git a/src/input/frontend/qbuttonaxisinput.cpp b/src/input/frontend/qbuttonaxisinput.cpp
index aaf1b6a1c..e6bfe4f8c 100644
--- a/src/input/frontend/qbuttonaxisinput.cpp
+++ b/src/input/frontend/qbuttonaxisinput.cpp
@@ -57,6 +57,7 @@ namespace Qt3DInput {
 
 /*!
  * \class Qt3DInput::QButtonAxisInput
+ * \inheaderfile Qt3DInput/QButtonAxisInput
  * \inmodule Qt3DInput
  * \brief An axis input controlled by buttons
  * \since 5.7
diff --git a/src/input/frontend/qmouseevent.cpp b/src/input/frontend/qmouseevent.cpp
index ff557ba8a..b1574f623 100644
--- a/src/input/frontend/qmouseevent.cpp
+++ b/src/input/frontend/qmouseevent.cpp
@@ -107,6 +107,7 @@ namespace Qt3DInput {
 
 /*!
  * \class Qt3DInput::QMouseEvent
+ * \inheaderfile Qt3DInput/QMouseEvent
  * \inmodule Qt3DInput
  *
  * \brief The Qt3DCore::QMouseEvent contains parameters that describe a mouse event.
@@ -335,6 +336,7 @@ QMouseEvent::Modifiers QMouseEvent::modifiers() const
 
 /*!
  * \class Qt3DInput::QWheelEvent
+ * \inheaderfile Qt3DInput/QWheelEvent
  * \inmodule Qt3DInput
  *
  * \brief The QWheelEvent class contains parameters that describe a mouse wheel event.
diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp
index 99e224142..75e68b819 100644
--- a/src/input/frontend/qmousehandler.cpp
+++ b/src/input/frontend/qmousehandler.cpp
@@ -109,6 +109,7 @@ void QMouseHandlerPrivate::mouseEvent(const QMouseEventPtr &event)
 
 /*!
  * \class Qt3DInput::QMouseHandler
+ * \inheaderfile Qt3DInput/QMouseHandler
  * \inmodule Qt3DInput
  *
  * \brief Provides a means of being notified about mouse events when attached to
diff --git a/src/quick3d/quick3d/qqmlaspectengine.cpp b/src/quick3d/quick3d/qqmlaspectengine.cpp
index 690f256a0..4b694d26e 100644
--- a/src/quick3d/quick3d/qqmlaspectengine.cpp
+++ b/src/quick3d/quick3d/qqmlaspectengine.cpp
@@ -65,6 +65,7 @@ QQmlAspectEnginePrivate::QQmlAspectEnginePrivate()
 
 /*!
  * \class Qt3DCore::Quick::QQmlAspectEngine
+ * \inheaderfile Qt3DQuick/QQmlAspectEngine
  * \inmodule Qt3DCore
  *
  * \brief The QQmlAspectEngine provides an environment for the QAspectEngine and
diff --git a/src/render/framegraph/qrendercapture.cpp b/src/render/framegraph/qrendercapture.cpp
index c4a42ff8a..62164b3ce 100644
--- a/src/render/framegraph/qrendercapture.cpp
+++ b/src/render/framegraph/qrendercapture.cpp
@@ -45,6 +45,7 @@ namespace Qt3DRender {
 
 /*!
  * \class Qt3DRender::QRenderCapture
+ * \inheaderfile Qt3DRender/QRenderCapture
  * \inmodule Qt3DRender
  *
  * \brief Frame graph node for render capture
@@ -68,6 +69,7 @@ namespace Qt3DRender {
 
 /*!
  * \class Qt3DRender::QRenderCaptureReply
+ * \inheaderfile Qt3DRender/QRenderCaptureReply
  * \inmodule Qt3DRender
  *
  * \brief Receives the result of render capture request.
diff --git a/src/render/framegraph/qrenderstateset.cpp b/src/render/framegraph/qrenderstateset.cpp
index 845fb5d91..35ac7fd04 100644
--- a/src/render/framegraph/qrenderstateset.cpp
+++ b/src/render/framegraph/qrenderstateset.cpp
@@ -58,6 +58,7 @@ QRenderStateSetPrivate::QRenderStateSetPrivate()
 
 /*!
  * \class Qt3DRender::QRenderStateSet
+ * \inheaderfile Qt3DRender/QRenderStateSet
  * \inmodule Qt3DRender
  *
  * \brief The QRenderStateSet \l {QFrameGraphNode}{FrameGraph} node offers a way of
diff --git a/src/render/frontend/qcamera.cpp b/src/render/frontend/qcamera.cpp
index 7a1f133a8..b9e180b97 100644
--- a/src/render/frontend/qcamera.cpp
+++ b/src/render/frontend/qcamera.cpp
@@ -62,6 +62,7 @@ QCameraPrivate::QCameraPrivate()
 
 /*!
  * \class Qt3DRender::QCamera
+ * \inheaderfile Qt3DRender/QCamera
  * \brief The QCamera class defines a view point through which the scene will be
  * rendered.
  * \inmodule Qt3DRender
diff --git a/src/render/frontend/qcameralens.cpp b/src/render/frontend/qcameralens.cpp
index 4725251b5..269bc8d16 100644
--- a/src/render/frontend/qcameralens.cpp
+++ b/src/render/frontend/qcameralens.cpp
@@ -46,6 +46,7 @@ namespace Qt3DRender {
 
 /*!
  * \class Qt3DRender::QCameraLens
+ * \inheaderfile Qt3DRender/QCameraLens
  * \inmodule Qt3DRender
  *
  * \brief Qt3DRender::QCameraLens specifies the projection matrix that will be used to
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index df1e42e75..d0d08edaa 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -141,6 +141,7 @@ namespace Qt3DRender {
 
 /*!
  * \class Qt3DRender::QRenderAspect
+ * \inheaderfile Qt3DRender/QRenderAspect
  * \brief The QRenderAspect class
  * \since 5.7
  * \inmodule Qt3DRender
diff --git a/src/render/geometry/qattribute.cpp b/src/render/geometry/qattribute.cpp
index 12ceda18f..8723f5177 100644
--- a/src/render/geometry/qattribute.cpp
+++ b/src/render/geometry/qattribute.cpp
@@ -75,6 +75,7 @@ QAttributePrivate::QAttributePrivate()
 
 /*!
  * \class Qt3DRender::QAttribute
+ * \inheaderfile Qt3DRender/QAttribute
  * \inmodule Qt3DRender
  *
  * \inherits Qt3DCore::QNode
diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp
index 061a351bf..02417f978 100644
--- a/src/render/geometry/qbuffer.cpp
+++ b/src/render/geometry/qbuffer.cpp
@@ -89,6 +89,7 @@ QBufferPrivate::QBufferPrivate()
 
 /*!
  * \class Qt3DRender::QBuffer
+ * \inheaderfile Qt3DRender/QBuffer
  * \inmodule Qt3DRender
  *
  * \inherits Qt3DCore::QNode
diff --git a/src/render/geometry/qgeometry.cpp b/src/render/geometry/qgeometry.cpp
index bdbaf5ab7..3f3065533 100644
--- a/src/render/geometry/qgeometry.cpp
+++ b/src/render/geometry/qgeometry.cpp
@@ -80,6 +80,7 @@ QGeometryPrivate::~QGeometryPrivate()
 
 /*!
  * \class Qt3DRender::QGeometry
+ * \inheaderfile Qt3DRender/QGeometry
  * \inmodule Qt3DRender
  *
  * \inherits Qt3DCore::QNode
diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp
index ddc1b1b23..970f555d3 100644
--- a/src/render/geometry/qgeometryrenderer.cpp
+++ b/src/render/geometry/qgeometryrenderer.cpp
@@ -138,6 +138,7 @@ QGeometryRendererPrivate::~QGeometryRendererPrivate()
 
 /*!
  * \class Qt3DRender::QGeometryRenderer
+ * \inheaderfile Qt3DRender/QGeometryRenderer
  * \inmodule Qt3DRender
  *
  * \inherits Qt3DCore::QComponent
diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp
index 30e8a9460..6e98d0e9a 100644
--- a/src/render/geometry/qmesh.cpp
+++ b/src/render/geometry/qmesh.cpp
@@ -78,6 +78,7 @@ QMeshPrivate::QMeshPrivate()
 
 /*!
  * \class Qt3DRender::QMesh
+ * \inheaderfile Qt3DRender/QMesh
  * \inmodule Qt3DRender
  *
  * \inherits Qt3DRender::QGeometryRenderer
diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp
index 10af1d24c..8f83fd02e 100644
--- a/src/render/materialsystem/qparameter.cpp
+++ b/src/render/materialsystem/qparameter.cpp
@@ -53,6 +53,7 @@
 
 /*!
  * \class Qt3DRender::QParameter
+ * \inheaderfile Qt3DRender/QParameter
  * \inmodule Qt3DRender
  *
  * \brief Provides storage for a name and value pair.
diff --git a/src/render/materialsystem/qshaderdata.cpp b/src/render/materialsystem/qshaderdata.cpp
index 066a6c55f..a636bc1a8 100644
--- a/src/render/materialsystem/qshaderdata.cpp
+++ b/src/render/materialsystem/qshaderdata.cpp
@@ -62,6 +62,7 @@ QShaderDataPrivate::QShaderDataPrivate(PropertyReaderInterfacePtr reader)
 
 /*!
  * \class Qt3DRender::QShaderData
+ * \inheaderfile Qt3DRender/QShaderData
  * \inmodule Qt3DRender
  *
  * \brief Provides a way of specifying values of a Uniform Block or a shader
diff --git a/src/render/renderstates/qblendequation.cpp b/src/render/renderstates/qblendequation.cpp
index e48e83883..220116626 100644
--- a/src/render/renderstates/qblendequation.cpp
+++ b/src/render/renderstates/qblendequation.cpp
@@ -40,6 +40,7 @@
 
 /*!
  * \class Qt3DRender::QBlendEquation
+ * \inheaderfile Qt3DRender/QBlendEquation
  * \brief The QBlendEquation class specifies the equation used for both the RGB
  *  blend equation and the Alpha blend equation
  * \inmodule Qt3DRender
diff --git a/src/render/renderstates/qrenderstatecreatedchange.cpp b/src/render/renderstates/qrenderstatecreatedchange.cpp
index a3466ca66..5e0713552 100644
--- a/src/render/renderstates/qrenderstatecreatedchange.cpp
+++ b/src/render/renderstates/qrenderstatecreatedchange.cpp
@@ -43,6 +43,7 @@ namespace Qt3DRender {
 
 /*!
  * \class Qt3DRender::QRenderStateCreatedChange
+ * \inheaderfile Qt3DRender/QRenderStateCreatedChange
  * \brief The QRenderStateCreatedChange class
  * \since 5.7
  * \inmodule Qt3DRender
diff --git a/src/render/texture/qtexturedata.cpp b/src/render/texture/qtexturedata.cpp
index 061c93198..b7bb75242 100644
--- a/src/render/texture/qtexturedata.cpp
+++ b/src/render/texture/qtexturedata.cpp
@@ -46,6 +46,7 @@ namespace Qt3DRender {
 
 /*!
  * \class Qt3DRender::QTextureData
+ * \inheaderfile Qt3DRender/QTextureData
  * \brief The QTextureData class stores texture information such as
  * the target, height, width, depth, layers, wrap, and if mipmaps are enabled.
  * \since 5.7