diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2019-11-08 00:48:05 +0100 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2019-11-11 09:53:52 +0000 |
| commit | 13d7517c0edd4c99686f2a8f7611c51d0a56a279 (patch) | |
| tree | 2a98462cfdc5031404f803cfe6941be77db9ff06 /src/quick/scenegraph | |
| parent | 06fa6ef1b9e159bd9b83b59ce23b7e09b918aa1f (diff) | |
Doc: Fix documentation warnings
There were a lot of documentation warnings introduced by the
separation of QtQml.Models and QtQml.WorkerScript modules
from the QtQml documentation project into their own
sub-projects.
Fix the above, and also ensure that the experimental
Qt.labs.qmlmodels QML types are listed in the documentation,
and add them also on the QML module page for QtQml.Models.
A few warnings remain, they may be indicative of issues
not in the scope of this commit.
Fixes: QTBUG-79812
Change-Id: Idc25c976e4c96feab4aae893519d6c9245f57a64
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/quick/scenegraph')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterialrhishader.cpp | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgtexture.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterialrhishader.cpp b/src/quick/scenegraph/coreapi/qsgmaterialrhishader.cpp index 117d477f9a..77593591bd 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterialrhishader.cpp +++ b/src/quick/scenegraph/coreapi/qsgmaterialrhishader.cpp @@ -319,7 +319,7 @@ bool QSGMaterialRhiShader::updateUniformData(RenderState &state, each variable in the material's shaders' \l{QShaderDescription::combinedImageSamplers()}. - When \c{*texture} is null, it must be set to a QSGTexture pointer before + When *\a{texture} is null, it must be set to a QSGTexture pointer before returning. When non-null, it is up to the material to decide if a new \c{QSGTexture *} is stored to it, or if it updates some parameters on the already known QSGTexture. The ownership of the QSGTexture is not diff --git a/src/quick/scenegraph/coreapi/qsgtexture.cpp b/src/quick/scenegraph/coreapi/qsgtexture.cpp index edcee96bdb..dfbe4d3ffd 100644 --- a/src/quick/scenegraph/coreapi/qsgtexture.cpp +++ b/src/quick/scenegraph/coreapi/qsgtexture.cpp @@ -701,8 +701,8 @@ void QSGTexture::updateBindOptions(bool force) // legacy (GL-only) data (for example, because there was no setImage() since the last call to this function), the function does nothing. - Materials involving textures are expected to call this function from their - updateSampledImage() implementation, typically without any conditions. + Materials involving \a rhi textures are expected to call this function from + their updateSampledImage() implementation, typically without any conditions. \note This function is only used when running the graphics API independent rendering path of the scene graph. |