diff options
author | Sze Howe Koh <szehowe.koh@gmail.com> | 2013-11-05 20:17:06 +0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-05 15:37:29 +0100 |
commit | 22c138abfce871a1d23f1cf1b98b448bcd3ec74f (patch) | |
tree | 6e3a8b03c4b87065529c5e2989505dacd4e2658b /src/quick | |
parent | e17ae3b8b716b00c7cb6156347101f2e789dbd58 (diff) |
Doc: Fix broken links
Change-Id: Ie7408409ddbaa354370267f2dd74326ec56a4186
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc | 2 | ||||
-rw-r--r-- | src/quick/doc/src/concepts/positioning/layouts.qdoc | 2 | ||||
-rw-r--r-- | src/quick/doc/src/concepts/positioning/righttoleft.qdoc | 2 | ||||
-rw-r--r-- | src/quick/doc/src/concepts/statesanimations/animations.qdoc | 5 | ||||
-rw-r--r-- | src/quick/doc/src/tutorial.qdoc | 1 | ||||
-rw-r--r-- | src/quick/items/qquickanimatedsprite.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickgridview.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickitemanimation.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquicklistview.cpp | 5 | ||||
-rw-r--r-- | src/quick/items/qquickpathview.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquicksprite.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickspritesequence.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquicktranslate.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 2 | ||||
-rw-r--r-- | src/quick/util/qquickanimation.cpp | 16 | ||||
-rw-r--r-- | src/quick/util/qquicksmoothedanimation.cpp | 2 | ||||
-rw-r--r-- | src/quick/util/qquickspringanimation.cpp | 2 |
17 files changed, 26 insertions, 27 deletions
diff --git a/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc b/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc index ba9ec9229e..b5dd961ea9 100644 --- a/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc +++ b/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc @@ -245,7 +245,7 @@ To visualize data, bind the view's \c model property to a model and the } \endqml - The \l{declarative/rssnews}{RSS News demo} shows how XmlListModel can + The \l{Qt Quick Demo - RSS News}{RSS News demo} shows how XmlListModel can be used to display an RSS feed. diff --git a/src/quick/doc/src/concepts/positioning/layouts.qdoc b/src/quick/doc/src/concepts/positioning/layouts.qdoc index 35be2f6235..fef55582dc 100644 --- a/src/quick/doc/src/concepts/positioning/layouts.qdoc +++ b/src/quick/doc/src/concepts/positioning/layouts.qdoc @@ -32,7 +32,7 @@ Positioner items are container items that manage the positions of items in a declarative user interface. Positioners behave in a similar way to -the \l{Widgets and Layouts}{layout managers} used with standard Qt widgets, +the \l{Qt Widgets}{layout managers} used with standard Qt widgets, except that they are also containers in their own right. Positioners make it easier to work with many items when they need diff --git a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc index 1c48058510..ad8b2f3b63 100644 --- a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc +++ b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc @@ -185,7 +185,7 @@ command-line parameter "-reverse": qmlviewer myapp.qml -reverse \endcode -The layout direction can also be set from C++ by calling the static function \l QApplication::setLayoutDirection(): +The layout direction can also be set from C++ by calling the static function \l QGuiApplication::setLayoutDirection(): \code QApplication app(argc, argv); diff --git a/src/quick/doc/src/concepts/statesanimations/animations.qdoc b/src/quick/doc/src/concepts/statesanimations/animations.qdoc index dcf1d49a72..1a324b1983 100644 --- a/src/quick/doc/src/concepts/statesanimations/animations.qdoc +++ b/src/quick/doc/src/concepts/statesanimations/animations.qdoc @@ -65,6 +65,8 @@ To create an animation, use an appropriate animation type for the type of the property that is to be animated, and apply the animation depending on the type of behavior that is required. +\sa {Qt Quick Examples - Animation} + \section1 Triggering Animations There are several ways of setting animation to an object. @@ -218,9 +220,6 @@ The \l SequentialAnimation type is also useful for playing \l{qml-transition-animations}{transition animations} because animations are played in parallel inside transitions. -See the \l {declarative/animation/basics}{Animation basics example} for a -demonstration of creating and combining multiple animations in QML. - \keyword qml-controlling-animations \section1 Controlling Animations diff --git a/src/quick/doc/src/tutorial.qdoc b/src/quick/doc/src/tutorial.qdoc index bd07c9a98d..a4428c5818 100644 --- a/src/quick/doc/src/tutorial.qdoc +++ b/src/quick/doc/src/tutorial.qdoc @@ -29,7 +29,6 @@ \page qml-tutorial.html \title QML Tutorial \brief An introduction to the basic concepts and features of QML. -\previouspage Introduction to the QML Language \nextpage QML Tutorial 1 - Basic Types This tutorial gives an introduction to QML, the declarative language for Qt Quick. It doesn't cover everything; diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp index 4c16a1e9e2..64b8f257dc 100644 --- a/src/quick/items/qquickanimatedsprite.cpp +++ b/src/quick/items/qquickanimatedsprite.cpp @@ -174,7 +174,7 @@ struct AnimatedSpriteVertices { as multiple frames in the same image file. You can play it at a fixed speed, at the frame rate of your display, or manually advance and control the progress. - For details of how a sprite animation is defined see the \l{Sprite Animation} overview. + For details of how a sprite animation is defined see the \l{Sprite Animations} overview. Note that the AnimatedSprite type does not use Sprite types to define multiple animations, but instead encapsulates a single animation itself. */ diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp index 1c6168fbc5..c9e6d4d7e2 100644 --- a/src/quick/items/qquickgridview.cpp +++ b/src/quick/items/qquickgridview.cpp @@ -1248,7 +1248,7 @@ bool QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte \image gridview-layout-toptobottom-rtl-btt.png \endtable - \sa {quick/modelviews/gridview}{GridView example} + \sa {QML Data Models}, ListView, PathView, {Qt Quick Examples - Views} */ QQuickGridView::QQuickGridView(QQuickItem *parent) diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp index 534ad0e2f4..b840ee421c 100644 --- a/src/quick/items/qquickitemanimation.cpp +++ b/src/quick/items/qquickitemanimation.cpp @@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE ParentChange that has occurred during the state change. This can be overridden by setting a specific target item using the \l target property. - \sa {Animation and Transitions in Qt Quick}, {declarative/animation/basics}{Animation basics example} + \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation} */ QQuickParentAnimation::QQuickParentAnimation(QObject *parent) : QQuickAnimationGroup(*(new QQuickParentAnimationPrivate), parent) diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp index 22d8176086..c55f9ef696 100644 --- a/src/quick/items/qquicklistview.cpp +++ b/src/quick/items/qquicklistview.cpp @@ -1744,7 +1744,7 @@ bool QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte \image listview-layout-righttoleft.png \endtable - \sa {QML Data Models}, GridView, {quick/modelviews/listview}{ListView examples} + \sa {QML Data Models}, GridView, PathView, {Qt Quick Examples - Views} */ QQuickListView::QQuickListView(QQuickItem *parent) : QQuickItemView(*(new QQuickListViewPrivate), parent) @@ -1907,7 +1907,8 @@ QQuickListView::~QQuickListView() so as to stay with the current item, unless the highlightFollowsCurrentItem property is false. - \sa highlightItem, highlightFollowsCurrentItem, {quick/modelviews/listview}{ListView examples} + \sa highlightItem, highlightFollowsCurrentItem, + {Qt Quick Examples - Views#Highlight demonstrates adding a custom highlight to a ListView.}{ListView highlight example} */ /*! diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp index d8132bdd12..696cf145da 100644 --- a/src/quick/items/qquickpathview.cpp +++ b/src/quick/items/qquickpathview.cpp @@ -553,7 +553,7 @@ void QQuickPathViewPrivate::setDragging(bool d) to set \e {clip: true} in order to have the out of view items clipped nicely. - \sa Path, {quick/modelviews/pathview}{PathView example} + \sa Path, {QML Data Models}, ListView, GridView, {Qt Quick Examples - Views} */ QQuickPathView::QQuickPathView(QQuickItem *parent) diff --git a/src/quick/items/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp index b2bfb69bab..00a265c814 100644 --- a/src/quick/items/qquicksprite.cpp +++ b/src/quick/items/qquicksprite.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE can be in the middle of an image file, or split along multiple rows, as long as they form a contiguous line wrapping to the next row of the file from the left edge of the file. - For full details, see the \l{Sprite Animation} overview. + For full details, see the \l{Sprite Animations} overview. */ /*! \qmlproperty int QtQuick::Sprite::duration diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp index 28f1397cc9..a90aa9ace2 100644 --- a/src/quick/items/qquickspritesequence.cpp +++ b/src/quick/items/qquickspritesequence.cpp @@ -172,7 +172,7 @@ struct SpriteVertices { SpriteSequence renders and controls a list of animations defined by \l Sprite types. - For full details, see the \l{Sprite Animation} overview. + For full details, see the \l{Sprite Animations} overview. */ /*! \qmlproperty bool QtQuick::SpriteSequence::running diff --git a/src/quick/items/qquicktranslate.cpp b/src/quick/items/qquicktranslate.cpp index 1ea5a6f7d6..93104ffa7a 100644 --- a/src/quick/items/qquicktranslate.cpp +++ b/src/quick/items/qquicktranslate.cpp @@ -335,7 +335,7 @@ public: \image axisrotation.png - \sa {declarative/ui-components/dialcontrol}{Dial Control example}, {declarative/toys/clocks}{Clocks example} + \sa {declarative/ui-components/dialcontrol}{Dial Control example}, {Qt Quick Demo - Clocks} */ QQuickRotation::QQuickRotation(QObject *parent) : QQuickTransform(*new QQuickRotationPrivate, parent) diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index dd338af1e3..9798974788 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -2768,7 +2768,7 @@ QOpenGLFramebufferObject *QQuickWindow::renderTarget() const Grabs the contents of the window and returns it as an image. It is possible to call the grabWindow() function when the window is not - visible. This requires that the window is \l{QWindow::create} {created} + visible. This requires that the window is \l{QWindow::create()} {created} and has a valid size and that no other QQuickWindow instances are rendering in the same process. diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index 6a762bea68..342cf2eaff 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -673,7 +673,7 @@ QQuickAbstractAnimation::ThreadingModel QQuickAbstractAnimation::threadingModel( } \endcode - \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example} + \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation} */ QQuickPauseAnimation::QQuickPauseAnimation(QObject *parent) : QQuickAbstractAnimation(*(new QQuickPauseAnimationPrivate), parent) @@ -752,7 +752,7 @@ QAbstractAnimationJob* QQuickPauseAnimation::transition(QQuickStateActions &acti \l{PropertyAnimation::}{properties} are explicitly set for the animation, then those are used instead. - \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example} + \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation} */ QQuickColorAnimation::QQuickColorAnimation(QObject *parent) : QQuickPropertyAnimation(parent) @@ -1275,7 +1275,7 @@ QAbstractAnimationJob* QQuickPropertyAction::transition(QQuickStateActions &acti changes in the number value that it is tracking. If this is the case, use SmoothedAnimation instead. - \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example} + \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation} */ QQuickNumberAnimation::QQuickNumberAnimation(QObject *parent) : QQuickPropertyAnimation(parent) @@ -1378,7 +1378,7 @@ void QQuickNumberAnimation::setTo(qreal t) sources. The \l {Animation and Transitions in Qt Quick} documentation shows a variety of methods for creating animations. - \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example} + \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation} */ QQuickVector3dAnimation::QQuickVector3dAnimation(QObject *parent) : QQuickPropertyAnimation(parent) @@ -1478,7 +1478,7 @@ void QQuickVector3dAnimation::setTo(QVector3D t) sources. The \l {Animation and Transitions in Qt Quick} documentation shows a variety of methods for creating animations. - \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example} + \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation} */ QVariant _q_interpolateShortestRotation(qreal &f, qreal &t, qreal progress) { @@ -1711,7 +1711,7 @@ QQmlListProperty<QQuickAbstractAnimation> QQuickAnimationGroup::animations() ParallelAnimation, it cannot be individually started and stopped; the SequentialAnimation or ParallelAnimation must be started and stopped as a group. - \sa ParallelAnimation, {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example} + \sa ParallelAnimation, {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation} */ QQuickSequentialAnimation::QQuickSequentialAnimation(QObject *parent) : @@ -1801,7 +1801,7 @@ QAbstractAnimationJob* QQuickSequentialAnimation::transition(QQuickStateActions ParallelAnimation, it cannot be individually started and stopped; the SequentialAnimation or ParallelAnimation must be started and stopped as a group. - \sa SequentialAnimation, {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example} + \sa SequentialAnimation, {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation} */ QQuickParallelAnimation::QQuickParallelAnimation(QObject *parent) : QQuickAnimationGroup(parent) @@ -1984,7 +1984,7 @@ void QQuickBulkValueAnimator::topLevelAnimationLoopChanged() Note that PropertyAnimation inherits the abstract \l Animation type. This includes additional properties and methods for controlling the animation. - \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example} + \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation} */ QQuickPropertyAnimation::QQuickPropertyAnimation(QObject *parent) diff --git a/src/quick/util/qquicksmoothedanimation.cpp b/src/quick/util/qquicksmoothedanimation.cpp index 53e3520bde..017fe39003 100644 --- a/src/quick/util/qquicksmoothedanimation.cpp +++ b/src/quick/util/qquicksmoothedanimation.cpp @@ -351,7 +351,7 @@ void QSmoothedAnimation::init() sources. The \l {Animation and Transitions in Qt Quick} documentation shows a variety of methods for creating animations. - \sa SpringAnimation, NumberAnimation, {Animation and Transitions in Qt Quick}, {declarative/animation/basics}{Animation basics example} + \sa SpringAnimation, NumberAnimation, {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation} */ QQuickSmoothedAnimation::QQuickSmoothedAnimation(QObject *parent) diff --git a/src/quick/util/qquickspringanimation.cpp b/src/quick/util/qquickspringanimation.cpp index f663491a58..efaa5ba56c 100644 --- a/src/quick/util/qquickspringanimation.cpp +++ b/src/quick/util/qquickspringanimation.cpp @@ -365,7 +365,7 @@ void QQuickSpringAnimationPrivate::updateMode() sources. The \l {Animation and Transitions in Qt Quick} documentation shows a variety of methods for creating animations. - \sa SmoothedAnimation, {Animation and Transitions in Qt Quick}, {declarative/animation/basics}{Animation basics example}, {declarative/toys/clocks}{Clocks example} + \sa SmoothedAnimation, {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation}, {Qt Quick Demo - Clocks} */ QQuickSpringAnimation::QQuickSpringAnimation(QObject *parent) |