diff options
Diffstat (limited to 'src/quick/doc/src/concepts')
8 files changed, 11 insertions, 13 deletions
diff --git a/src/quick/doc/src/concepts/effects/particles.qdoc b/src/quick/doc/src/concepts/effects/particles.qdoc index ec49c6df43..c3262b7082 100644 --- a/src/quick/doc/src/concepts/effects/particles.qdoc +++ b/src/quick/doc/src/concepts/effects/particles.qdoc @@ -46,7 +46,7 @@ \page qtquick-effects-particles.html \title Using the Qt Quick Particle System - Documentation for all Particle System types can be found on the \l{QtQuick.Particles 2}{QtQuick.Particles} module page. + Documentation for all Particle System types can be found on the \l QtQuick.Particles module page. Note that to use types from the particles module, you will need to import the types with the following line: \code diff --git a/src/quick/doc/src/concepts/input/focus.qdoc b/src/quick/doc/src/concepts/input/focus.qdoc index 827f6d85c8..065651c826 100644 --- a/src/quick/doc/src/concepts/input/focus.qdoc +++ b/src/quick/doc/src/concepts/input/focus.qdoc @@ -168,7 +168,7 @@ When a QML \l Item explicitly relinquishes focus (by setting its system does not automatically select another type to receive focus. That is, it is possible for there to be no currently active focus. -See the \l{declarative/keyinteraction/focus}{Keyboard Focus example} for a +See \l{Qt Quick Examples - Key Interaction} for a demonstration of moving keyboard focus between multiple areas using FocusScope types. diff --git a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc index 28bbbf1cca..abef6b765b 100644 --- a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc +++ b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc @@ -174,8 +174,8 @@ with list models of QAbstractItemModel type: The above examples use QQmlContext::setContextProperty() to set model values directly in QML components. An alternative to this is to register the C++ model class as a QML type (either -\l{qtqml-registercpptypes.html}{directly} from a C++ entry-point, or within -the initialization function of a \l{qtqml-modules-cppplugins.html} +\l{Defining QML Types from C++}{directly} from a C++ entry-point, or within +the initialization function of a \l{Creating C++ Plugins for QML} {QML C++ plugin}, as shown below). This would allow the model classes to be created directly as types within QML: @@ -215,7 +215,7 @@ ListView { \endtable -See \l {Tutorial: Extending QML with C++} for details on writing QML C++ +See \l {Writing QML Extensions with C++} for details on writing QML C++ plugins. diff --git a/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc b/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc index b5dd961ea9..1a539f56ed 100644 --- a/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc +++ b/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc @@ -193,8 +193,7 @@ To visualize data, bind the view's \c model property to a model and the and \l{qtqml-typesystem-topic.html#qml-object-types} {creating QML types} articles. - The use of positioner items to arrange items from a model is covered in - \l{Generating Items with Repeaters}. + Positioning of items from a model can be achieved using a \l{Repeater}. \section2 ListModel diff --git a/src/quick/doc/src/concepts/modelviewsdata/topic.qdoc b/src/quick/doc/src/concepts/modelviewsdata/topic.qdoc index 6939c3131f..21c81f47e5 100644 --- a/src/quick/doc/src/concepts/modelviewsdata/topic.qdoc +++ b/src/quick/doc/src/concepts/modelviewsdata/topic.qdoc @@ -49,7 +49,7 @@ see the page titled \l{qtquick-modelviewsdata-modelview.html} Databases are commonly used to store information in applications. Qt Quick provides simplified access to relational databases via the -\l{QtQuick.LocalStorage 2}{Qt Quick local storage module}. +\l QtQuick.LocalStorage module. */ diff --git a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc index ad8b2f3b63..5d173efedb 100644 --- a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc +++ b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc @@ -89,7 +89,7 @@ views that takes the mirroring into account can be read from the \c effectiveLay The attached property \l LayoutMirroring is provided as a convenience for easily implementing right-to-left support for existing left-to-right Qt Quick applications. It mirrors the behavior of \l {anchor-layout} -{Item anchors}, the layout direction of \l{Composing User Interfaces with QML#Positioners}{positioners} and +{Item anchors}, the layout direction of \l{Item Positioners}{positioners} and \l{qtquick-modelviewsdata-modelview.html}{model views}, and the explicit text alignment of QML text types. You can enable layout mirroring for a particular \l Item: diff --git a/src/quick/doc/src/concepts/positioning/topic.qdoc b/src/quick/doc/src/concepts/positioning/topic.qdoc index bae6a7f71b..51cb07c51d 100644 --- a/src/quick/doc/src/concepts/positioning/topic.qdoc +++ b/src/quick/doc/src/concepts/positioning/topic.qdoc @@ -51,7 +51,7 @@ the position manually than to use the more dynamic positioning methods documented in proceeding sections. In Qt Quick, every visual object is positioned within the -\l{qtquick-visual-coordinates.html}{coordinate system} +\l{Concepts - Visual Coordinates in Qt Quick}{coordinate system} provided by the Qt Quick visual canvas. As described in that document, the x and y coordinates of a visual object are relative to those of its visual parent, with the top-left corner having the coordinate (0, 0). diff --git a/src/quick/doc/src/concepts/statesanimations/animations.qdoc b/src/quick/doc/src/concepts/statesanimations/animations.qdoc index 07f1048bf2..e4e208863b 100644 --- a/src/quick/doc/src/concepts/statesanimations/animations.qdoc +++ b/src/quick/doc/src/concepts/statesanimations/animations.qdoc @@ -72,7 +72,7 @@ animations provide timing controls and allows different interpolations through \snippet qml/animation.qml property animation -Specialized \l{qml-property-animation-types}{property animation types} +Specialized property animation types have more efficient implementations than the \l{PropertyAnimation} type. They are for setting animations to different QML types such as \c int, \c color, and rotations. Similarly, the \l{ParentAnimation} can animate parent changes. @@ -145,8 +145,7 @@ values. abrupt property changes; animations smooth transitions to produce visually appealing state changes. -The \l{Transition} type can contain -\l{qml-animation-types}{animation types} to interpolate property changes +The \l{Transition} type can contain animation types to interpolate property changes caused by state changes. To assign the transition to an object, bind it to the \c transitions property. |