diff options
| author | Nico Vertriest <nico.vertriest@theqtcompany.com> | 2016-10-12 15:17:47 +0200 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@theqtcompany.com> | 2016-10-13 12:56:51 +0000 |
| commit | 7886ae1425cd1b06a7c57d4477eeab7868628bcf (patch) | |
| tree | 1839615c6a08d1ae3625178fd75bd0f4e8296ad9 | |
| parent | b4b4ecfde9ff7e266c4f38aedf9520eab908193d (diff) | |
Doc: various link errors qt3d
assimpio.cpp:72: warning: Can't link to 'GLTFPIO'
qpicktriangleevent.cpp:66: warning: Can't link to 'QPickSettings'
qpicktriangleevent.cpp:76: warning: Can't link to 'PickSettings'
shadow-map-qml.qdoc:28: warning: Can't link to 'RendererSettings'
shadow-map-qml.qdoc:28: warning: Can't link to 'Techniques'
Change-Id: I039a4134d18e2b2472554215a69e971650b29b64
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| -rw-r--r-- | examples/qt3d/shadow-map-qml/doc/src/shadow-map-qml.qdoc | 4 | ||||
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpio.cpp | 2 | ||||
| -rw-r--r-- | src/render/geometry/qattribute.cpp | 2 | ||||
| -rw-r--r-- | src/render/picking/qpicktriangleevent.cpp | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/examples/qt3d/shadow-map-qml/doc/src/shadow-map-qml.qdoc b/examples/qt3d/shadow-map-qml/doc/src/shadow-map-qml.qdoc index 7edfd70ce..ad6190e95 100644 --- a/examples/qt3d/shadow-map-qml/doc/src/shadow-map-qml.qdoc +++ b/examples/qt3d/shadow-map-qml/doc/src/shadow-map-qml.qdoc @@ -121,7 +121,7 @@ \skipto import QtQuick \printuntil Render 2.0 - The code defines a \l RendererSettings entity that has a tree of entities as the + The code defines a \l RenderSettings entity that has a tree of entities as the active framegraph: \printuntil clearColor @@ -202,7 +202,7 @@ \printuntil ] It is possible to put such parameters all the way down, from a \l Material, - to its \l Effect, to one of the effect’s \l Techniques. This allows a + to its \l Effect, to one of the effect’s \l {Technique}{Techniques}. This allows a \l Material instance to override defaults in an \l Effect or \l Technique. The bindings array provides the same thing, except that it also allows us to rename some parameters. In this example, it renames the \c ambient, diff --git a/src/plugins/sceneparsers/assimp/assimpio.cpp b/src/plugins/sceneparsers/assimp/assimpio.cpp index cc40fd1f7..ba0fa00ca 100644 --- a/src/plugins/sceneparsers/assimp/assimpio.cpp +++ b/src/plugins/sceneparsers/assimp/assimpio.cpp @@ -78,8 +78,6 @@ namespace Qt3DRender { format into a Qt3D scene. It should be noted that Assimp aiString is explicitly defined to be UTF-8. - - \sa GLTFPIO */ Q_LOGGING_CATEGORY(AssimpIOLog, "Qt3D.AssimpIO") diff --git a/src/render/geometry/qattribute.cpp b/src/render/geometry/qattribute.cpp index ef439f2b4..12ceda18f 100644 --- a/src/render/geometry/qattribute.cpp +++ b/src/render/geometry/qattribute.cpp @@ -86,7 +86,7 @@ QAttributePrivate::QAttributePrivate() * will ensure your geometry will be compatible with picking and the various * materials provided in the Qt3DExtras module. * - * \sa QBuffer. + * \sa QBuffer */ /*! diff --git a/src/render/picking/qpicktriangleevent.cpp b/src/render/picking/qpicktriangleevent.cpp index 7a50ce74f..5c77b3ab8 100644 --- a/src/render/picking/qpicktriangleevent.cpp +++ b/src/render/picking/qpicktriangleevent.cpp @@ -69,7 +69,7 @@ public: \brief The QPickTriangleEvent class holds information when a triangle is picked - \sa QPickEvent, QPickSettings + \sa QPickEvent \since 5.7 */ @@ -78,7 +78,7 @@ public: * \instantiates Qt3DRender::QPickTriangleEvent * \inqmlmodule Qt3D.Render * \brief PickTriangleEvent holds information when a triangle is picked. - * \sa ObjectPicker, PickSettings + * \sa ObjectPicker */ |