From 13d7517c0edd4c99686f2a8f7611c51d0a56a279 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 8 Nov 2019 00:48:05 +0100 Subject: 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 --- .../quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 2a584c26cc..55cbcd8f2e 100644 --- a/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc +++ b/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc @@ -29,7 +29,7 @@ \example scenegraph/metaltextureimport \title Scene Graph - Metal Texture Import \ingroup qtquickexamples - \brief Shows how to use a texture created directly with Metal + \brief Shows how to use a texture created directly with Metal. \image metaltextureimport-example.jpg -- cgit v1.2.3 From 06267f90a2ec6e67c754f1b9fd2a516c37fd784e Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Fri, 8 Nov 2019 15:12:48 +1000 Subject: fix rendernode example build When not building developer mode, the install does not copy the files on other platforms Fixes: QTBUG-79781 Change-Id: Ibc8352c59d16b69618d53750511d5b5650ed5290 Reviewed-by: Qt CI Bot Reviewed-by: Laszlo Agocs --- examples/quick/scenegraph/rendernode/customrenderitem.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'examples/quick') diff --git a/examples/quick/scenegraph/rendernode/customrenderitem.cpp b/examples/quick/scenegraph/rendernode/customrenderitem.cpp index e55cf0a2f4..5f51522c47 100644 --- a/examples/quick/scenegraph/rendernode/customrenderitem.cpp +++ b/examples/quick/scenegraph/rendernode/customrenderitem.cpp @@ -53,8 +53,12 @@ #include #include "openglrenderer.h" +#ifdef Q_OS_MACOS #include "metalrenderer.h" +#endif +#if QT_CONFIG(d3d12) #include "d3d12renderer.h" +#endif #include "softwarerenderer.h" //! [1] -- cgit v1.2.3