diff options
author | Topi Reinio <topi.reinio@qt.io> | 2023-10-20 14:37:42 +0000 |
---|---|---|
committer | Topi Reinio <topi.reinio@qt.io> | 2023-12-01 12:57:28 +0000 |
commit | 72c825e685229a2b747f1d79216ef3c6d3304de8 (patch) | |
tree | 9dd48571d38a847e2a8a31229ca6ee307979dffe /src | |
parent | 39793d56e004279d81c6a1191bb7b24c83ae0b8a (diff) |
Doc: Fix linking to Qt Qml module
The module landing page has been renamed in
af0539c7bb6f46e89523054c09d5d846ae55f355.
The correct link target is 'Qt Qml'.
Change-Id: I4a13348948fe1577e7a62edbb49a0d99f9695322
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src')
25 files changed, 34 insertions, 34 deletions
diff --git a/src/core/doc/src/qtqmlcore.qdoc b/src/core/doc/src/qtqmlcore.qdoc index 934746fa80..2c8b0ef8b1 100644 --- a/src/core/doc/src/qtqmlcore.qdoc +++ b/src/core/doc/src/qtqmlcore.qdoc @@ -23,6 +23,6 @@ \list \li \l{Qt Core} - \li \l{Qt QML} + \li \l{Qt Qml} \endlist */ diff --git a/src/labs/animation/qquickboundaryrule.cpp b/src/labs/animation/qquickboundaryrule.cpp index 431113b0ba..ead72be187 100644 --- a/src/labs/animation/qquickboundaryrule.cpp +++ b/src/labs/animation/qquickboundaryrule.cpp @@ -111,7 +111,7 @@ void QQuickBoundaryReturnJob::updateState(QAbstractAnimationJob::State newState, Note that a property cannot have more than one assigned BoundaryRule. \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation#Behaviors}{Behavior -example}, {Qt QML}, {Qt Quick Examples - Pointer Handlers} +example}, {Qt Qml}, {Qt Quick Examples - Pointer Handlers} */ QQuickBoundaryRule::QQuickBoundaryRule(QObject *parent) diff --git a/src/qml/doc/src/cppclasses/topic.qdoc b/src/qml/doc/src/cppclasses/topic.qdoc index 0ef283fe16..78595fa13a 100644 --- a/src/qml/doc/src/cppclasses/topic.qdoc +++ b/src/qml/doc/src/cppclasses/topic.qdoc @@ -5,7 +5,7 @@ \title Important C++ Classes Provided By The Qt QML Module \brief Overview of the C++ classes provided by the Qt QML module -The \l{Qt QML} module provides C++ classes which implement the QML framework. +The \l{Qt Qml} module provides C++ classes which implement the QML framework. Clients can use these classes to interact with the QML run-time (for example, by injecting data or invoking methods on objects), and to instantiate a hierarchy of objects from a QML document. The Qt QML module provides more diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc index d926b17c09..0759ab79f8 100644 --- a/src/qml/doc/src/cppintegration/definetypes.qdoc +++ b/src/qml/doc/src/cppintegration/definetypes.qdoc @@ -16,7 +16,7 @@ as an instantiable \l{qtqml-typesystem-objecttypes.html}{QML object type} from QML, or enabling a singleton instance of the class to be imported and used from QML. -Additionally, the \l {Qt QML} module provides mechanisms for implementing QML-specific +Additionally, the \l {Qt Qml} module provides mechanisms for implementing QML-specific features such as \e{attached properties} and \e{default properties} in C++. (Note that a number of the important concepts covered in this document are @@ -275,7 +275,7 @@ not be instantiable should not be instantiable from QML \endlist -The \l {Qt QML} module provides several macros for registering non-instantiable +The \l {Qt Qml} module provides several macros for registering non-instantiable types: \list @@ -946,7 +946,7 @@ its properties have been set. For example, this may be the case if the initialization is costly, or if the initialization should not be performed until all property values have been initialized. -The \l {Qt QML} module provides the QQmlParserStatus to be subclassed for these +The \l {Qt Qml} module provides the QQmlParserStatus to be subclassed for these purposes. It defines a number of virtual methods that are invoked at various stages during component instantiation. To receive these notifications, a C++ class should inherit QQmlParserStatus and also notify the Qt meta system diff --git a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc index f7205f14e3..588c12a885 100644 --- a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc +++ b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc @@ -6,7 +6,7 @@ \title Writing QML Extensions with C++ \brief Tutorial about extending QML with Qt C++. -The \l {Qt QML} module provides a set of APIs for extending QML through +The \l {Qt Qml} module provides a set of APIs for extending QML through C++ extensions. You can write extensions to add your own QML types, extend existing Qt types, or call C/C++ functions that are not accessible from ordinary QML code. diff --git a/src/qml/doc/src/cppintegration/topic.qdoc b/src/qml/doc/src/cppintegration/topic.qdoc index 4548af2b39..b14c54a24e 100644 --- a/src/qml/doc/src/cppintegration/topic.qdoc +++ b/src/qml/doc/src/cppintegration/topic.qdoc @@ -7,7 +7,7 @@ \brief Highlights important points about integrating C++ with QML. \ingroup explanations-programminglanguages -QML is designed to be easily extensible through C++ code. The classes in the \l {Qt QML} module +QML is designed to be easily extensible through C++ code. The classes in the \l {Qt Qml} module enable QML objects to be loaded and manipulated from C++, and the nature of QML engine's integration with Qt's \l{Meta Object System}{meta object system} enables C++ functionality to be invoked directly from QML. This allows the development of hybrid applications which are implemented @@ -21,7 +21,7 @@ with QML and JavaScript within \l{qtqml-documents-topic.html}{QML documents}, an C++ \li Use and invoke some C++ functionality from QML (for example, to invoke your application logic, use a data model implemented in C++, or call some functions in a third-party C++ library) -\li Access functionality in the \l {Qt QML} or \l {Qt Quick} C++ API (for example, to dynamically generate +\li Access functionality in the \l {Qt Qml} or \l {Qt Quick} C++ API (for example, to dynamically generate images using QQuickImageProvider) \li Implement your own \l{qtqml-typesystem-objecttypes.html}{QML object types} from C++ \unicode{0x2014} whether for use within your own specific application, or for distribution to others @@ -49,7 +49,7 @@ methods and signals to be accessed from QML These are the most common methods of accessing C++ functionality from QML code; for more options and details, see the main documentation pages that are described in the sections further below. -Additionally, aside from the ability to access C++ functionality from QML, the \l {Qt QML} module also +Additionally, aside from the ability to access C++ functionality from QML, the \l {Qt Qml} module also provides ways to do the reverse and manipulate QML objects from C++ code. See \l{qtqml-cppintegration-interactqmlfromcpp.html}{Interacting with QML Objects from C++} for more details. @@ -95,7 +95,7 @@ registered for other purposes: for example, it could be registered as a \e {Sing single class instance to be imported by QML code, or it could be registered to enable the enumeration values of a non-instantiable class to be accessible from QML. -Additionally, the \l {Qt QML} module provides mechanisms to define QML types that integrate with QML +Additionally, the \l {Qt Qml} module provides mechanisms to define QML types that integrate with QML concepts like attached properties and default properties. For more information on registering and creating custom QML types from C++, see the \l @@ -106,7 +106,7 @@ For more information on registering and creating custom QML types from C++, see C++ objects and values can be embedded directly into the context (or \e scope) of loaded QML objects using \e {context properties} and \e {context objects}. This is achieved through the QQmlContext -class provided by the \l {Qt QML} module, which exposes data to the context of a QML component, allowing +class provided by the \l {Qt Qml} module, which exposes data to the context of a QML component, allowing data to be injected from C++ into QML. See \l{qtqml-cppintegration-contextproperties.html}{Embedding C++ Objects into QML with Context diff --git a/src/qml/doc/src/qmllanguageref/qmlreference.qdoc b/src/qml/doc/src/qmllanguageref/qmlreference.qdoc index 6fccac3314..7f92129fcf 100644 --- a/src/qml/doc/src/qmllanguageref/qmlreference.qdoc +++ b/src/qml/doc/src/qmllanguageref/qmlreference.qdoc @@ -14,7 +14,7 @@ In addition, QML heavily uses Qt, which allows types and other Qt features to be accessible directly from QML applications. This reference guide describes the features of the QML language. Many of the -QML types in the guide originate from the \l{Qt QML} or \l{Qt Quick} +QML types in the guide originate from the \l{Qt Qml} or \l{Qt Quick} modules. \list diff --git a/src/qml/doc/src/qmltypereference.qdoc b/src/qml/doc/src/qmltypereference.qdoc index 1c8b2b2dbf..7ec7624b9e 100644 --- a/src/qml/doc/src/qmltypereference.qdoc +++ b/src/qml/doc/src/qmltypereference.qdoc @@ -7,7 +7,7 @@ \ingroup qmlmodules \brief List of QML types provided by the Qt QML module -The \l{Qt QML} module provides the definition and implementation of various +The \l{Qt Qml} module provides the definition and implementation of various convenience types that can be used with the QML language. This includes elementary QML types, which can provide the basis for further extensions to the QML language. The \l QtObject and \l Component object types are non-visual and diff --git a/src/qml/doc/src/qtqml-cpp.qdoc b/src/qml/doc/src/qtqml-cpp.qdoc index 9e140c5674..e337364489 100644 --- a/src/qml/doc/src/qtqml-cpp.qdoc +++ b/src/qml/doc/src/qtqml-cpp.qdoc @@ -9,5 +9,5 @@ \brief The C++ API provided by the Qt QML module. For more information on the Qt QML module, see the -\l{Qt QML} module documentation. +\l{Qt Qml} module documentation. */ diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 11ef88444e..877efc357b 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -247,7 +247,7 @@ V4_DEFINE_EXTENSION(QQmlComponentExtension, componentExtension); } \endqml - \sa {Qt QML} + \sa {Qt Qml} */ /*! diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp index 97c809611a..cb2da29c10 100644 --- a/src/qml/types/qqmlbind.cpp +++ b/src/qml/types/qqmlbind.cpp @@ -384,7 +384,7 @@ void QQmlBindPrivate::validate(QQmlBind *q) const The Binding type restores any previously set direct bindings on the property. - \sa {Qt QML} + \sa {Qt Qml} */ QQmlBind::QQmlBind(QObject *parent) : QObject(*(new QQmlBindPrivate), parent) diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp index 66eff47222..19363f9f76 100644 --- a/src/qml/types/qqmlconnections.cpp +++ b/src/qml/types/qqmlconnections.cpp @@ -202,7 +202,7 @@ public: then all signal handlers specified as \c{function} in the same Connections object are ignored. - \sa {Qt QML} + \sa {Qt Qml} */ QQmlConnections::QQmlConnections(QObject *parent) : QObject(*(new QQmlConnectionsPrivate), parent) diff --git a/src/qmlmodels/doc/src/qtqmlmodel.qdoc b/src/qmlmodels/doc/src/qtqmlmodel.qdoc index 321b3fd57b..f75530e93c 100644 --- a/src/qmlmodels/doc/src/qtqmlmodel.qdoc +++ b/src/qmlmodels/doc/src/qtqmlmodel.qdoc @@ -17,7 +17,7 @@ \endqml \note QtQml.Models module started at version 2.1 to match the version - of the parent module, \l{Qt QML}. + of the parent module, \l{Qt Qml}. In addition, Qt.labs.qmlmodels provides experimental QML types for models. To use these experimental types, import the module with the following line: diff --git a/src/qmlmodels/qqmllistmodel.cpp b/src/qmlmodels/qqmllistmodel.cpp index 0ae29aa20a..a6e70ee6e5 100644 --- a/src/qmlmodels/qqmllistmodel.cpp +++ b/src/qmlmodels/qqmllistmodel.cpp @@ -2009,7 +2009,7 @@ void DynamicRoleModelNodeMetaObject::propertyWritten(int index) You must call sync() or else the changes made to the list from that thread will not be reflected in the list model in the main thread. - \sa {qml-data-models}{Data Models}, {Qt QML} + \sa {qml-data-models}{Data Models}, {Qt Qml} */ QQmlListModel::QQmlListModel(QObject *parent) diff --git a/src/qmlmodels/qquickpackage.cpp b/src/qmlmodels/qquickpackage.cpp index 9721e21de8..7ab1e8345f 100644 --- a/src/qmlmodels/qquickpackage.cpp +++ b/src/qmlmodels/qquickpackage.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE \note Package is part of QtQml.Models since version 2.14 and part of QtQuick since version 2.0. Importing Package via QtQuick is deprecated since Qt 5.14. - \sa {Qt Quick Examples - Views}, {Qt QML} + \sa {Qt Quick Examples - Views}, {Qt Qml} */ /*! diff --git a/src/qmlnetwork/doc/src/qtqmlnetwork.qdoc b/src/qmlnetwork/doc/src/qtqmlnetwork.qdoc index 6f74cc1fb2..56d768efa0 100644 --- a/src/qmlnetwork/doc/src/qtqmlnetwork.qdoc +++ b/src/qmlnetwork/doc/src/qtqmlnetwork.qdoc @@ -18,6 +18,6 @@ \list \li \l{Qt Network} - \li \l{Qt QML} + \li \l{Qt Qml} \endlist */ diff --git a/src/qmlxmllistmodel/qqmlxmllistmodel.cpp b/src/qmlxmllistmodel/qqmlxmllistmodel.cpp index 9ae07eb4c7..b2b1d4ab33 100644 --- a/src/qmlxmllistmodel/qqmlxmllistmodel.cpp +++ b/src/qmlxmllistmodel/qqmlxmllistmodel.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE \inqmlmodule QtQml.XmlListModel \brief For specifying a role to an \l XmlListModel. - \sa {All QML Types}{Qt QML} + \sa {All QML Types}{Qt Qml} */ /*! diff --git a/src/quick/doc/src/examples.qdoc b/src/quick/doc/src/examples.qdoc index 352f7c9a7e..6e3b3a08dc 100644 --- a/src/quick/doc/src/examples.qdoc +++ b/src/quick/doc/src/examples.qdoc @@ -13,7 +13,7 @@ Qt includes several examples to demonstrate a particular usage. The examples run as applications or as non-GUI examples in Qt Creator. Qt tutorials show the step-by-step information and give insight to particular code snippets. -This page lists the \l{Qt QML} and \l{Qt Quick} examples, however, many other +This page lists the \l{Qt Qml} and \l{Qt Quick} examples, however, many other \l{All Modules}{Qt modules} contain examples related to their QML API. \section1 Running the Examples and Demos @@ -81,7 +81,7 @@ steps such as use cases and introductory material. For more information about Qt \section2 Extending QML The following tutorials show how a QML-based application can be combined and -exteneded with C++ code using the \l{Qt QML} module. +exteneded with C++ code using the \l{Qt Qml} module. \list \li \l {Writing QML Extensions with C++} \li \l {Writing advanced QML Extensions with C++} diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc index 3444b7fdfa..68be036d95 100644 --- a/src/quick/doc/src/qtquick.qdoc +++ b/src/quick/doc/src/qtquick.qdoc @@ -7,7 +7,7 @@ \brief The Qt Quick module implements the "standard library" for QML The Qt Quick module is the standard library for writing QML applications. -While the \l{Qt QML} module provides the QML engine and +While the \l{Qt Qml} module provides the QML engine and language infrastructure, the Qt Quick module provides all the basic types necessary for creating user interfaces with QML. It provides a visual canvas and includes types for creating and animating @@ -73,7 +73,7 @@ When using the Qt Quick module, you will need to know how to write QML applications using the QML language. In particular, QML Basics and QML Essentials from the \l{QML Applications} page. -To find out more about using the QML language, see the \l{Qt QML} module documentation. +To find out more about using the QML language, see the \l{Qt Qml} module documentation. \section1 C++ Extension Points @@ -101,7 +101,7 @@ To find out more about using the QML language, see the \l{Qt QML} module documen \li \l {QML Applications} - essential information for application development with QML and Qt Quick - \li \l {Qt QML} + \li \l {Qt Qml} - documentation for the Qt QML module, which provides the QML engine and language infrastructure \li \l {Qt Quick How-tos} diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index 548ec8415a..67c77ae704 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -1075,7 +1075,7 @@ QAbstractAnimationJob* QQuickScriptAction::transition(QQuickStateActions &action PropertyAction object) so that the rotation animation begins with the correct transform origin. - \sa {Animation and Transitions in Qt Quick}, {Qt QML} + \sa {Animation and Transitions in Qt Quick}, {Qt Qml} */ QQuickPropertyAction::QQuickPropertyAction(QObject *parent) : QQuickAbstractAnimation(*(new QQuickPropertyActionPrivate), parent) diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp index 21207f1f06..dd8ddad7ca 100644 --- a/src/quick/util/qquickbehavior.cpp +++ b/src/quick/util/qquickbehavior.cpp @@ -183,7 +183,7 @@ UntypedProxyProperty::UntypedProxyProperty(QUntypedBindable bindable, QQuickBeha state change. For general advice on using Behaviors to animate state changes, see \l{Using Qt Quick Behaviors with States}. - \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation#Behaviors}{Behavior example}, {Qt QML} + \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation#Behaviors}{Behavior example}, {Qt Qml} */ diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp index f27c23cc9e..ab08a725bb 100644 --- a/src/quick/util/qquickpropertychanges.cpp +++ b/src/quick/util/qquickpropertychanges.cpp @@ -103,7 +103,7 @@ QT_BEGIN_NAMESPACE edited with \l{Qt Design Studio}. Mind that \l{Qt Design Studio} also imposes a number of further restrictions on the files it can work with. - \sa {Qt Quick Examples - Animation#States}{States example}, {Qt Quick States}, {Qt QML} + \sa {Qt Quick Examples - Animation#States}{States example}, {Qt Quick States}, {Qt Qml} */ /*! diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp index 51bc9852f4..7d589cf95e 100644 --- a/src/quick/util/qquickstate.cpp +++ b/src/quick/util/qquickstate.cpp @@ -112,7 +112,7 @@ QQuickStateOperation::QQuickStateOperation(QObjectPrivate &dd, QObject *parent) not allowed. \sa {Qt Quick Examples - Animation#States}{States example}, {Qt Quick States}, - {Animation and Transitions in Qt Quick}{Transitions}, {Qt QML} + {Animation and Transitions in Qt Quick}{Transitions}, {Qt Qml} */ QQuickState::QQuickState(QObject *parent) : QObject(*(new QQuickStatePrivate), parent) diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp index 737ec9731e..9a469b8112 100644 --- a/src/quick/util/qquickstategroup.cpp +++ b/src/quick/util/qquickstategroup.cpp @@ -85,7 +85,7 @@ public: } \endqml - \sa {Qt Quick States}{Qt Quick States}, {Animation and Transitions in Qt Quick}{Transitions}, {Qt QML} + \sa {Qt Quick States}{Qt Quick States}, {Animation and Transitions in Qt Quick}{Transitions}, {Qt Qml} */ QQuickStateGroup::QQuickStateGroup(QObject *parent) diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp index 33f67265cf..19a1ceb830 100644 --- a/src/quick/util/qquicktransition.cpp +++ b/src/quick/util/qquicktransition.cpp @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE \l Behavior, the Transition animation overrides the \l Behavior for that state change. - \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation#States}{States example}, {Qt Quick States}, {Qt QML} + \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation#States}{States example}, {Qt Quick States}, {Qt Qml} */ //ParallelAnimationWrapper allows us to do a "callback" when the animation finishes, rather than connecting |