Doc: Fix some broken links

Change-Id: I1385a8947107a7c80b32306fc587aff45536a4ec
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

diff --git a/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc b/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc
index 8020f03..e54404d 100644 (file)
--- a/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc
+++ b/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc
@@ -35,7 +35,7 @@ useful to delay instantiation of objects until necessary, thereby improving
 application startup time.  It also allows visual objects to be dynamically
 created and added to the scene in reaction to user input or other events.
 
-See the \l {declarative/toys/dynamicscene}{Dynamic Scene example} for a
+See the \l {QML Example - Dynamic Scene}{Dynamic Scene example} for a
 demonstration of the concepts discussed on this page.
 
 

diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc
index 8bd4187..2c6bc64 100644 (file)
--- a/src/qml/doc/src/qtqml.qdoc
+++ b/src/qml/doc/src/qtqml.qdoc
@@ -31,7 +31,7 @@
 \brief The Qt QML module defines and implements the QML language
 
 The Qt QML module provides a framework for developing applications and libraries
-with the \l{The QML Language}{QML language}. It defines and implements the
+with the \l{QML Application Developer Resources}{QML language}. It defines and implements the
 language and engine infrastructure, and provides an API to enable application
 developers to extend the QML language with custom types and integrate QML code
 with JavaScript and C++. The Qt QML module provides both a \l{Qt QML QML Types}

diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 29dba5f..457d0bb 100644 (file)
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -1344,7 +1344,7 @@ v8::Handle<v8::Value> createComponent(const v8::Arguments &args)
     Example:
     \snippet qml/qsTranslate.qml 0
 
-    \sa {Localization And Internationalization Support In Qt Quick}
+    \sa {Internationalization and Localization with Qt Quick}
 */
 v8::Handle<v8::Value> qsTranslate(const v8::Arguments &args)
 {
@@ -1401,7 +1401,7 @@ v8::Handle<v8::Value> qsTranslate(const v8::Arguments &args)
     Example:
     \snippet qml/qtTranslateNoOp.qml 0
 
-    \sa {Localization And Internationalization Support In Qt Quick}
+    \sa {Internationalization and Localization with Qt Quick}
 */
 v8::Handle<v8::Value> qsTranslateNoOp(const v8::Arguments &args)
 {
@@ -1425,7 +1425,7 @@ v8::Handle<v8::Value> qsTranslateNoOp(const v8::Arguments &args)
     Example:
     \snippet qml/qsTr.qml 0
 
-    \sa {Localization And Internationalization Support In Qt Quick}
+    \sa {Internationalization and Localization with Qt Quick}
 */
 v8::Handle<v8::Value> qsTr(const v8::Arguments &args)
 {
@@ -1479,7 +1479,7 @@ v8::Handle<v8::Value> qsTr(const v8::Arguments &args)
     Example:
     \snippet qml/qtTrNoOp.qml 0
 
-    \sa {Localization And Internationalization Support In Qt Quick}
+    \sa {Internationalization and Localization with Qt Quick}
 */
 v8::Handle<v8::Value> qsTrNoOp(const v8::Arguments &args)
 {
@@ -1516,7 +1516,7 @@ v8::Handle<v8::Value> qsTrNoOp(const v8::Arguments &args)
     Creating binary translation (QM) files suitable for use with this function requires passing
     the \c -idbased option to the \c lrelease tool.
 
-    \sa QT_TRID_NOOP, {Localization And Internationalization Support In Qt Quick}
+    \sa QT_TRID_NOOP, {Internationalization and Localization with Qt Quick}
 */
 v8::Handle<v8::Value> qsTrId(const v8::Arguments &args)
 {
@@ -1549,7 +1549,7 @@ v8::Handle<v8::Value> qsTrId(const v8::Arguments &args)
     Example:
     \snippet qml/qtTrIdNoOp.qml 0
 
-    \sa qsTrId(), {Localization And Internationalization Support In Qt Quick}
+    \sa qsTrId(), {Internationalization and Localization with Qt Quick}
 */
 v8::Handle<v8::Value> qsTrIdNoOp(const v8::Arguments &args)
 {

diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc
index 9fba663..cafe10d 100644 (file)
--- a/src/quick/doc/src/qtquick.qdoc
+++ b/src/quick/doc/src/qtquick.qdoc
@@ -76,7 +76,7 @@ of the \l{qtquick-quickstart-basics.html}{QML Basics} and
 \l{qtquick-quickstart-essentials.html}{QML Essentials} from the
 \l{qtquick-applicationdevelopers.html}{QML Application Developer Resources}.
 
-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 Qt Quick Module Documentation

diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 0c58b9b..4144256 100644 (file)
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -266,7 +266,7 @@ QQuickCanvasItemPrivate::~QQuickCanvasItemPrivate()
     requires the pixel data to be exchanged between the system memory and the
     graphic card, which is significantly more expensive.  Rendering may also be
     synchronized with the V-sync signal (to avoid
-    \l{en.wikipedia.org/wiki/Screen_tearing}{screen tearing}) which will further
+    \l{http://en.wikipedia.org/wiki/Screen_tearing}{screen tearing}) which will further
     impact pixel operations with \c Canvas.FrambufferObject render target.
 
     \section1 Tips for Porting Existing HTML5 Canvas applications

diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp
index 66f4b44..789d2e6 100644 (file)
--- a/src/quick/items/qquickpositioners.cpp
+++ b/src/quick/items/qquickpositioners.cpp
@@ -644,7 +644,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem)
 
     \image verticalpositioner_transition.gif
 
-    \sa Row, Grid, Flow, Positioner, {qml/positioners}{Positioners example}
+    \sa Row, Grid, Flow, Positioner, {Qt Quick Examples - Positioners}
 */
 /*!
     \qmlproperty Transition QtQuick2::Column::populate
@@ -657,7 +657,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem)
     the item that is being added. See the \l ViewTransition documentation for more details
     and examples on using these transitions.
 
-    \sa add, ViewTransition, {declarative/positioners}{Positioners example}
+    \sa add, ViewTransition, {Qt Quick Examples - Positioners}
 */
 /*!
     \qmlproperty Transition QtQuick2::Column::add
@@ -679,7 +679,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem)
     \note This transition is not applied to the items that already part of the positioner
     at the time of its creation. In this case, the \l populate transition is applied instead.
 
-    \sa populate, ViewTransition, {declarative/positioners}{Positioners example}
+    \sa populate, ViewTransition, {Qt Quick Examples - Positioners}
 */
 /*!
     \qmlproperty Transition QtQuick2::Column::move
@@ -704,7 +704,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem)
     positioner at the time of its creation. From \l {Qt Quick}{Qt Quick 2} onwards, positioners apply the
     \l populate transition to these items instead.
 
-    \sa add, ViewTransition, {qml/positioners}{Positioners example}
+    \sa add, ViewTransition, {Qt Quick Examples - Positioners}
 */
 /*!
   \qmlproperty real QtQuick2::Column::spacing
@@ -798,7 +798,7 @@ void QQuickColumn::reportConflictingAnchors()
     \l{Item Layouts}.
 
 
-    \sa Column, Grid, Flow, Positioner, {qml/positioners}{Positioners example}
+    \sa Column, Grid, Flow, Positioner, {Qt Quick Examples - Positioners}
 */
 /*!
     \qmlproperty Transition QtQuick2::Row::populate
@@ -811,7 +811,7 @@ void QQuickColumn::reportConflictingAnchors()
     the item that is being added. See the \l ViewTransition documentation for more details
     and examples on using these transitions.
 
-    \sa add, ViewTransition, {declarative/positioners}{Positioners example}
+    \sa add, ViewTransition, {Qt Quick Examples - Positioners}
 */
 /*!
     \qmlproperty Transition QtQuick2::Row::add
@@ -833,7 +833,7 @@ void QQuickColumn::reportConflictingAnchors()
     \note This transition is not applied to the items that already part of the positioner
     at the time of its creation. In this case, the \l populate transition is applied instead.
 
-    \sa populate, ViewTransition, {declarative/positioners}{Positioners example}
+    \sa populate, ViewTransition, {Qt Quick Examples - Positioners}
 */
 /*!
     \qmlproperty Transition QtQuick2::Row::move
@@ -858,7 +858,7 @@ void QQuickColumn::reportConflictingAnchors()
     positioner at the time of its creation. From \l {Qt Quick}{QtQuick 2} onwards, positioners apply the
     \l populate transition to these items instead.
 
-    \sa add, ViewTransition, {qml/positioners}{Positioners example}
+    \sa add, ViewTransition, {Qt Quick Examples - Positioners}
 */
 /*!
   \qmlproperty real QtQuick2::Row::spacing
@@ -887,7 +887,7 @@ QQuickRow::QQuickRow(QQuickItem *parent)
     the right anchor remains to the right of the row.
     \endlist
 
-    \sa Grid::layoutDirection, Flow::layoutDirection, {qml/righttoleft/layoutdirection}{Layout directions example}
+    \sa Grid::layoutDirection, Flow::layoutDirection, {Qt Quick Examples - Right to Left}
 */
 
 Qt::LayoutDirection QQuickRow::layoutDirection() const
@@ -1031,7 +1031,7 @@ void QQuickRow::reportConflictingAnchors()
     \l{Item Layouts}.
 
 
-    \sa Flow, Row, Column, Positioner, {qml/positioners}{Positioners example}
+    \sa Flow, Row, Column, Positioner, {Qt Quick Examples - Positioners}
 */
 /*!
     \qmlproperty Transition QtQuick2::Grid::populate
@@ -1044,7 +1044,7 @@ void QQuickRow::reportConflictingAnchors()
     the item that is being added. See the \l ViewTransition documentation for more details
     and examples on using these transitions.
 
-    \sa add, ViewTransition, {declarative/positioners}{Positioners example}
+    \sa add, ViewTransition, {Qt Quick Examples - Positioners}
 */
 /*!
     \qmlproperty Transition QtQuick2::Grid::add
@@ -1066,7 +1066,7 @@ void QQuickRow::reportConflictingAnchors()
     \note This transition is not applied to the items that already part of the positioner
     at the time of its creation. In this case, the \l populate transition is applied instead.
 
-    \sa populate, ViewTransition, {declarative/positioners}{Positioners example}
+    \sa populate, ViewTransition, {Qt Quick Examples - Positioners}
 */
 /*!
     \qmlproperty Transition QtQuick2::Grid::move
@@ -1091,7 +1091,7 @@ void QQuickRow::reportConflictingAnchors()
     positioner at the time of its creation. From \l {Qt Quick}{QtQuick 2} onwards, positioners apply the
     \l populate transition to these items instead.
 
-    \sa add, ViewTransition, {qml/positioners}{Positioners example}
+    \sa add, ViewTransition, {Qt Quick Examples - Positioners}
 */
 /*!
   \qmlproperty qreal QtQuick2::Grid::spacing
@@ -1248,7 +1248,7 @@ void QQuickGrid::setColumnSpacing(const qreal columnSpacing)
     \l Grid::flow property.
     \endlist
 
-    \sa Flow::layoutDirection, Row::layoutDirection, {qml/righttoleft/layoutdirection}{Layout directions example}
+    \sa Flow::layoutDirection, Row::layoutDirection, {Qt Quick Examples - Right to Left}
 */
 Qt::LayoutDirection QQuickGrid::layoutDirection() const
 {
@@ -1572,7 +1572,7 @@ void QQuickGrid::reportConflictingAnchors()
     For more information on using Flow and other related positioner-types, see
     \l{Item Layouts}.
 
-  \sa Column, Row, Grid, Positioner, {qml/positioners}{Positioners example}
+  \sa Column, Row, Grid, Positioner, {Qt Quick Examples - Positioners}
 */
 /*!
     \qmlproperty Transition QtQuick2::Flow::populate
@@ -1585,7 +1585,7 @@ void QQuickGrid::reportConflictingAnchors()
     the item that is being added. See the \l ViewTransition documentation for more details
     and examples on using these transitions.
 
-    \sa add, ViewTransition, {declarative/positioners}{Positioners example}
+    \sa add, ViewTransition, {Qt Quick Examples - Positioners}
 */
 /*!
     \qmlproperty Transition QtQuick2::Flow::add
@@ -1607,7 +1607,7 @@ void QQuickGrid::reportConflictingAnchors()
     \note This transition is not applied to the items that already part of the positioner
     at the time of its creation. In this case, the \l populate transition is applied instead.
 
-    \sa populate, ViewTransition, {declarative/positioners}{Positioners example}
+    \sa populate, ViewTransition, {Qt Quick Examples - Positioners}
 */
 /*!
     \qmlproperty Transition QtQuick2::Flow::move
@@ -1632,7 +1632,7 @@ void QQuickGrid::reportConflictingAnchors()
     positioner at the time of its creation. From \l {Qt Quick}{QtQuick 2} onwards, positioners apply the
     \l populate transition to these items instead.
 
-    \sa add, ViewTransition, {qml/positioners}{Positioners example}
+    \sa add, ViewTransition, {Qt Quick Examples - Positioners}
 */
 /*!
   \qmlproperty real QtQuick2::Flow::spacing
@@ -1710,7 +1710,7 @@ void QQuickFlow::setFlow(Flow flow)
     \l Flow::flow property.
     \endlist
 
-    \sa Grid::layoutDirection, Row::layoutDirection, {qml/righttoleft/layoutdirection}{Layout directions example}
+    \sa Grid::layoutDirection, Row::layoutDirection, {Qt Quick Examples - Right to Left}
 */
 
 Qt::LayoutDirection QQuickFlow::layoutDirection() const

diff --git a/src/quick/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp
index 3c3bd88..c9f3793 100644 (file)
--- a/src/quick/items/qquickrectangle.cpp
+++ b/src/quick/items/qquickrectangle.cpp
@@ -302,7 +302,7 @@ int QQuickRectanglePrivate::doUpdateSlotIdx = -1;
     \clearfloat
     \section1 Performance
 
-    Using the \l antialiasing property improves the appearance of a rounded rectangle at
+    Using the \l Item::antialiasing property improves the appearance of a rounded rectangle at
     the cost of rendering performance. You should consider unsetting this property
     for rectangles in motion, and only set it when they are stationary.