diff options
author | Jaishree Vyas <[email protected]> | 2025-01-28 13:54:06 +0100 |
---|---|---|
committer | Alexei Cazacov <[email protected]> | 2025-06-05 13:16:21 +0000 |
commit | 03a5b7c56637029638a8573c43fa6bd0b69b3dda (patch) | |
tree | 5e954737bff18bcf9b43e96c079fcae6a665604a | |
parent | 9d7f189b995b2b0488367a7eaf6e027888a357c1 (diff) |
Fixes: QTBUG-132703
Pick-to: 6.9 6.10
Change-Id: Iee8cd7415d7e5c088f0b43786326c8339b46490a
Reviewed-by: Olivier De Cannière <[email protected]>
-rw-r--r-- | src/qml/doc/src/qmltypereference.qdoc | 12 | ||||
-rw-r--r-- | src/qmlcompiler/doc/qtqmlcompiler-index.qdoc | 8 | ||||
-rw-r--r-- | src/qmlcompiler/doc/qtqmlcompiler-toc.qdoc | 4 | ||||
-rw-r--r-- | src/qmlcompiler/doc/src/qtqmlcompiler-module.qdoc | 4 | ||||
-rw-r--r-- | src/qmlmodels/doc/qtqmlmodels.qdocconf | 2 | ||||
-rw-r--r-- | src/qmlnetwork/doc/src/qtqmlnetwork-qmltypes.qdoc | 2 | ||||
-rw-r--r-- | src/qmlworkerscript/doc/qtqmlworkerscript.qdocconf | 4 | ||||
-rw-r--r-- | src/qmlworkerscript/doc/src/qmlworkerscript.qdoc | 2 | ||||
-rw-r--r-- | src/quick/doc/src/qtquick.qdoc | 2 |
9 files changed, 20 insertions, 20 deletions
diff --git a/src/qml/doc/src/qmltypereference.qdoc b/src/qml/doc/src/qmltypereference.qdoc index 67dd6a9fea..ccea736752 100644 --- a/src/qml/doc/src/qmltypereference.qdoc +++ b/src/qml/doc/src/qmltypereference.qdoc @@ -35,18 +35,18 @@ import QtQuick See the \l{Qt Quick} module documentation for more information about its types. The QML types for creating lists and models, such as \l ListModel and -\l ListElement, belong to a submodule, \l{Qt QML Models QML Types}{QtQml.Models}. +\l ListElement, belong to a submodule, \l{Qt Qml Models QML Types}{QtQml.Models}. The \l WorkerScript QML type belongs to the submodule -\l{Qt QML WorkerScript QML Types}{QtQml.WorkerScript}. +\l{Qt Qml WorkerScript QML Types}{QtQml.WorkerScript}. -Both, \l{Qt QML Models QML Types}{QtQml.Models} and -\l{Qt QML WorkerScript QML Types}{QtQml.WorkerScript} are automatically imported +Both, \l{Qt Qml Models QML Types}{QtQml.Models} and +\l{Qt Qml WorkerScript QML Types}{QtQml.WorkerScript} are automatically imported whenever you import \c QtQml. All their types are then available, too. The \l{Qt Quick} module automatically imports \c QtQml and, transitively, -\l{Qt QML Models QML Types}{QtQml.Models} and -\l{Qt QML WorkerScript QML Types}{QtQml.WorkerScript}, making all their types +\l{Qt Qml Models QML Types}{QtQml.Models} and +\l{Qt Qml WorkerScript QML Types}{QtQml.WorkerScript}, making all their types available whenever you import \c QtQuick. \section1 Value Types diff --git a/src/qmlcompiler/doc/qtqmlcompiler-index.qdoc b/src/qmlcompiler/doc/qtqmlcompiler-index.qdoc index c0814ae611..c6dce9c718 100644 --- a/src/qmlcompiler/doc/qtqmlcompiler-index.qdoc +++ b/src/qmlcompiler/doc/qtqmlcompiler-index.qdoc @@ -3,10 +3,10 @@ /*! \page qtqmlcompiler-index.html - \title Qt QML Compiler + \title Qt Qml Compiler \brief Provides tools for static analysis of QML code. - The Qt QML Compiler module contains shared functionality needed by QML + The Qt Qml Compiler module contains shared functionality needed by QML tooling like the \l{Qt Quick Compiler} and \l{qmllint}. It also provides the QQmlSA framework, which can be used to extend the built-in analysis capabilities of the tools. @@ -25,7 +25,7 @@ \section1 Using the QQmlSA framework - The Qt QML Compiler module offers the QQmlSA framework which provides tools + The Qt Qml Compiler module offers the QQmlSA framework which provides tools for static analysis of QML code. These tools can help ensure syntactic validity and warn about QML anti-patterns. @@ -71,7 +71,7 @@ \section1 Reference \list - \li \l {Qt QML Compiler C++ Classes} + \li \l {Qt Qml Compiler C++ Classes} - the C++ API provided by the QmlCompiler module \li QML tooling using the static analysis capabilities \list diff --git a/src/qmlcompiler/doc/qtqmlcompiler-toc.qdoc b/src/qmlcompiler/doc/qtqmlcompiler-toc.qdoc index b19962b441..2bb274312d 100644 --- a/src/qmlcompiler/doc/qtqmlcompiler-toc.qdoc +++ b/src/qmlcompiler/doc/qtqmlcompiler-toc.qdoc @@ -3,10 +3,10 @@ /*! \page qtqmlcompiler-toc.html - \title Qt QML Compiler module topics + \title Qt Qml Compiler module topics The following list has links to all the individual topics (HTML files) - in the Qt QML Compiler module. + in the Qt Qml Compiler module. \list \li \l {QML Static Analysis Tutorial} diff --git a/src/qmlcompiler/doc/src/qtqmlcompiler-module.qdoc b/src/qmlcompiler/doc/src/qtqmlcompiler-module.qdoc index 152fc94cd4..3f4c7b0fce 100644 --- a/src/qmlcompiler/doc/src/qtqmlcompiler-module.qdoc +++ b/src/qmlcompiler/doc/src/qtqmlcompiler-module.qdoc @@ -4,10 +4,10 @@ /*! \module QtQmlCompiler \modulestate Technical Preview - \title Qt QML Compiler C++ Classes + \title Qt Qml Compiler C++ Classes \qtcmakepackage QmlCompiler For more information on the Qt QmlCompiler module, see the - \l{Qt QML Compiler} module documentation.\brief The Qt QML Compiler module provides tools + \l{Qt Qml Compiler} module documentation.\brief The Qt Qml Compiler module provides tools for static analysis of QML code. */ diff --git a/src/qmlmodels/doc/qtqmlmodels.qdocconf b/src/qmlmodels/doc/qtqmlmodels.qdocconf index 2d74f94e23..acce91f5b1 100644 --- a/src/qmlmodels/doc/qtqmlmodels.qdocconf +++ b/src/qmlmodels/doc/qtqmlmodels.qdocconf @@ -11,7 +11,7 @@ qhp.QtQmlModels.file = qtqmlmodels.qhp qhp.QtQmlModels.namespace = org.qt-project.qtqmlmodels.$QT_VERSION_TAG qhp.QtQmlModels.virtualFolder = qtqmlmodels qhp.QtQmlModels.indexRoot = -qhp.QtQmlModels.indexTitle = Qt QML Models +qhp.QtQmlModels.indexTitle = Qt Qml Models qhp.QtQmlModels.subprojects = manual qmltypes qmllabtypes diff --git a/src/qmlnetwork/doc/src/qtqmlnetwork-qmltypes.qdoc b/src/qmlnetwork/doc/src/qtqmlnetwork-qmltypes.qdoc index 24ddd5317c..c96f3949b6 100644 --- a/src/qmlnetwork/doc/src/qtqmlnetwork-qmltypes.qdoc +++ b/src/qmlnetwork/doc/src/qtqmlnetwork-qmltypes.qdoc @@ -3,7 +3,7 @@ /*! \qmlmodule QtNetwork - \title Qt QML Network QML Types + \title Qt Qml Network QML Types \since 6.7 \ingroup qmlmodules \brief Provides core network functionality in QML. diff --git a/src/qmlworkerscript/doc/qtqmlworkerscript.qdocconf b/src/qmlworkerscript/doc/qtqmlworkerscript.qdocconf index a7a21e1cf5..34fdfd3ade 100644 --- a/src/qmlworkerscript/doc/qtqmlworkerscript.qdocconf +++ b/src/qmlworkerscript/doc/qtqmlworkerscript.qdocconf @@ -11,12 +11,12 @@ qhp.QtQmlWorkerScript.file = qtqmlworkerscript.qhp qhp.QtQmlWorkerScript.namespace = org.qt-project.qtqmlworkerscript.$QT_VERSION_TAG qhp.QtQmlWorkerScript.virtualFolder = qtqmlworkerscript qhp.QtQmlWorkerScript.indexRoot = -qhp.QtQmlWorkerScript.indexTitle = Qt QML WorkerScript +qhp.QtQmlWorkerScript.indexTitle = Qt Qml WorkerScript qhp.QtQmlWorkerScript.subprojects = qmltypes qhp.QtQmlWorkerScript.subprojects.qmltypes.title = QML Types -qhp.QtQmlWorkerScript.subprojects.qmltypes.indexTitle = Qt QML WorkerScript QML Types +qhp.QtQmlWorkerScript.subprojects.qmltypes.indexTitle = Qt Qml WorkerScript QML Types qhp.QtQmlWorkerScript.subprojects.qmltypes.selectors = qmltype qhp.QtQmlWorkerScript.subprojects.qmltypes.sortPages = true diff --git a/src/qmlworkerscript/doc/src/qmlworkerscript.qdoc b/src/qmlworkerscript/doc/src/qmlworkerscript.qdoc index a2c74f4d82..ce77d1fb55 100644 --- a/src/qmlworkerscript/doc/src/qmlworkerscript.qdoc +++ b/src/qmlworkerscript/doc/src/qmlworkerscript.qdoc @@ -3,7 +3,7 @@ /*! \qmlmodule QtQml.WorkerScript - \title Qt QML WorkerScript QML Types + \title Qt Qml WorkerScript QML Types \ingroup qmlmodules \brief Provides QML types for worker scripts. \since 5.14 diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc index 0d0890398f..a5da21ace1 100644 --- a/src/quick/doc/src/qtquick.qdoc +++ b/src/quick/doc/src/qtquick.qdoc @@ -102,7 +102,7 @@ To find out more about using the QML language, see the \l{Qt Qml} module documen - essential information for application development with QML and Qt Quick \li \l {Qt Qml} - - documentation for the Qt QML module, which provides the QML engine + - documentation for the Qt Qml module, which provides the QML engine and language infrastructure \li \l {Qt Quick How-tos} - shows how to achieve specific tasks in Qt Quick |