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/doc | |
| 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/doc')
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 5 | ||||
| -rw-r--r-- | src/quick/doc/snippets/cmake-macros/examples.cmake | 2 | ||||
| -rw-r--r-- | src/quick/doc/src/concepts/visualcanvas/adaptations.qdoc | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 91458527dd..0d46e3408d 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -38,7 +38,7 @@ qhp.QtQuick.subprojects.examples.selectors = fake:example tagfile = ../../../doc/qtquick/qtquick.tags -depends += qtcore qtqml qtqmltest qtgui qtlinguist qtquickcontrols qtquickcontrols1 qtdoc qtquickdialogs qtsensors qtwidgets qmake qtmultimedia qtgraphicaleffects qtsql qtxmlpatterns +depends += qtcore qtqml qtqmlmodels qtqmltest qtgui qtlinguist qtquickcontrols qtquickcontrols1 qtdoc qtquickdialogs qtsensors qtwidgets qmake qtmultimedia qtgraphicaleffects qtsql qtxmlpatterns headerdirs += ..\ ../../quick \ @@ -70,6 +70,9 @@ sourcedirs += ../../plugins #exclude certain directories excludedirs += ../../imports/models \ + ../../imports/labsmodels \ + ../../imports/testlib \ + ../../imports/workerscript \ ../../imports/statemachine excludefiles += ../util/qquickpropertychanges_p.h diff --git a/src/quick/doc/snippets/cmake-macros/examples.cmake b/src/quick/doc/snippets/cmake-macros/examples.cmake index 8ca6180f9b..cecc59debc 100644 --- a/src/quick/doc/snippets/cmake-macros/examples.cmake +++ b/src/quick/doc/snippets/cmake-macros/examples.cmake @@ -3,4 +3,4 @@ find_package(Qt5 COMPONENTS Quick QmlImportScanner) add_executable(myapp main.cpp) target_link_libraries(myapp Qt5::Quick) qt5_import_qml_plugins(myapp) -#! [qt5_import_plugins] +#! [qt5_import_qml_plugins] diff --git a/src/quick/doc/src/concepts/visualcanvas/adaptations.qdoc b/src/quick/doc/src/concepts/visualcanvas/adaptations.qdoc index e83aa39734..88003b68d3 100644 --- a/src/quick/doc/src/concepts/visualcanvas/adaptations.qdoc +++ b/src/quick/doc/src/concepts/visualcanvas/adaptations.qdoc @@ -55,7 +55,7 @@ appropriate for the various graphics APIs. Unlike \c software or \c d3d12, the RHI-based renderer is not an additional adaptation, and is always built-in. As of Qt 5.14 it can be enabled by setting the environment variable \c{QSG_RHI} to a non-zero value before starting the -application, or via \l QQuickWindow::setScenegraphBackend() in combination with +application, or via \l QQuickWindow::setSceneGraphBackend() in combination with \l QSGRendererInterface::GraphicsApi. When none of this is done, OpenGL is used directly like in previous versions. |