diff options
author | Topi Reinio <topi.reinio@qt.io> | 2020-11-04 12:37:45 +0100 |
---|---|---|
committer | Topi Reinio <topi.reinio@qt.io> | 2020-11-05 09:00:48 +0100 |
commit | 0b12055548a8781b0c328991c267d62222667e8e (patch) | |
tree | de91b0183203dd00318fed9fa5ca4cff6713142a /src/quick/scenegraph | |
parent | c01ad45d67ec0ce96d6944496dc292a94f17efea (diff) |
Doc: Fix documentation warnings for Qt Quick
- Remove links to modules and examples that are not part of Qt 6.
- Remove links to entities marked as \internal
- Add missing enum value and QML property docs where it's trivial
to do so.
Task-number: QTBUG-88156
Change-Id: I10a1c7bcc5fe0e2354ea69eaf24930362edb7415
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/quick/scenegraph')
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterialshader.cpp | 3 | ||||
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgtexture.cpp | 14 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterialshader.cpp b/src/quick/scenegraph/coreapi/qsgmaterialshader.cpp index 150e54db6d..45e7a6fb4e 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterialshader.cpp +++ b/src/quick/scenegraph/coreapi/qsgmaterialshader.cpp @@ -539,6 +539,9 @@ bool QSGMaterialShader::updateGraphicsPipelineState(RenderState &state, Graphics \value DirtyOpacity Used to indicate that the opacity has changed and must be updated. + \value DirtyCachedMaterialData Used to indicate that the cached material + state has changed and must be updated. + \value DirtyAll Used to indicate that everything needs to be updated. */ diff --git a/src/quick/scenegraph/coreapi/qsgtexture.cpp b/src/quick/scenegraph/coreapi/qsgtexture.cpp index 4bf1e020fd..94c25a5fc7 100644 --- a/src/quick/scenegraph/coreapi/qsgtexture.cpp +++ b/src/quick/scenegraph/coreapi/qsgtexture.cpp @@ -276,7 +276,7 @@ static void qt_debug_remove_texture(QSGTexture* texture) \note All classes with QSG prefix should be used solely on the scene graph's rendering thread. See \l {Scene Graph and Rendering} for more information. - \sa {Scene Graph - Rendering FBOs}, {Scene Graph - Rendering FBOs in a thread} + \sa {Scene Graph - Rendering FBOs} */ /*! @@ -724,7 +724,8 @@ namespace QNativeInterface { QT_DEFINE_NATIVE_INTERFACE(QSGOpenGLTexture); /*! - Creates a new QSGTexture wrapping an existing OpenGL texture object. + Creates a new QSGTexture wrapping an existing OpenGL texture object for + \a window. The native object specified in \a textureId is wrapped, but not owned, by the resulting QSGTexture. The caller of the function is responsible for @@ -791,7 +792,8 @@ namespace QNativeInterface { QT_DEFINE_NATIVE_INTERFACE(QSGD3D11Texture); /*! - Creates a new QSGTexture wrapping an existing Direct 3D 11 \a texture object. + Creates a new QSGTexture wrapping an existing Direct 3D 11 \a texture object + for \a window. The native object is wrapped, but not owned, by the resulting QSGTexture. The caller of the function is responsible for deleting the returned @@ -857,7 +859,8 @@ namespace QNativeInterface { /*! \fn QSGTexture *QNativeInterface::QSGMetalTexture::fromNative(id<MTLTexture> texture, QQuickWindow *window, const QSize &size, QQuickWindow::CreateTextureOptions options) - Creates a new QSGTexture wrapping an existing Metal \a texture object. + Creates a new QSGTexture wrapping an existing Metal \a texture object for + \a window. The native object is wrapped, but not owned, by the resulting QSGTexture. The caller of the function is responsible for deleting the returned @@ -915,7 +918,8 @@ namespace QNativeInterface { QT_DEFINE_NATIVE_INTERFACE(QSGVulkanTexture); /*! - Creates a new QSGTexture wrapping an existing Vulkan \a image object. + Creates a new QSGTexture wrapping an existing Vulkan \a image object for + \a window. The native object is wrapped, but not owned, by the resulting QSGTexture. The caller of the function is responsible for deleting the returned |