From 0b12055548a8781b0c328991c267d62222667e8e Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 4 Nov 2020 12:37:45 +0100 Subject: 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 --- .../scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc | 3 +-- .../scenegraph/vulkantextureimport/doc/src/vulkantextureimport.qdoc | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'examples/quick') diff --git a/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc b/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc index 1d6e0ab5c0..3fb2cd357e 100644 --- a/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc +++ b/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc @@ -37,8 +37,7 @@ use a \l{https://developer.apple.com/documentation/metal/mtltexture}{MTLTexture} in the Qt Quick scene. This provides an alternative to the \l{Scene Graph - - Metal Under QML}{underlay}, overlay, or \l{Scene Graph - Custom Rendering - with QSGRenderNode}{render node} approaches when it comes to integrating + Metal Under QML}{underlay} or overlay approaches when it comes to integrating native Metal rendering. In many cases going through a texture, and therefore "flattening" the 3D contents first, is the best option to integrate and mix custom 3D contents with the 2D UI elements provided by Qt diff --git a/examples/quick/scenegraph/vulkantextureimport/doc/src/vulkantextureimport.qdoc b/examples/quick/scenegraph/vulkantextureimport/doc/src/vulkantextureimport.qdoc index 334291f990..6da6b7ab6d 100644 --- a/examples/quick/scenegraph/vulkantextureimport/doc/src/vulkantextureimport.qdoc +++ b/examples/quick/scenegraph/vulkantextureimport/doc/src/vulkantextureimport.qdoc @@ -38,8 +38,7 @@ use a \l{https://www.khronos.org/registry/vulkan/specs/1.1-extensions/man/html/VkImage.html} {VkImage} in the Qt Quick scene. This provides an alternative to the \l{Scene Graph - - Vulkan Under QML}{underlay}, overlay, or \l{Scene Graph - Custom Rendering - with QSGRenderNode}{render node} approaches when it comes to integrating + Vulkan Under QML}{underlay} or overlay approaches when it comes to integrating native Vulkan rendering. This example is equivalent in most ways to the \l{Scene Graph - Metal Texture Import}{Metal Texture Import} -- cgit v1.2.3