Doc: link issues qtdeclarative

Task-number: QTBUG-43810
Change-Id: I154ffa83512435c3e455937a3f81931a45d9e368
Reviewed-by: Martin Smith <martin.smith@digia.com>

2 files changed, 12 insertions, 12 deletions

diff --git a/src/quick/doc/src/dynamicview-tutorial.qdoc b/src/quick/doc/src/dynamicview-tutorial.qdoc
index 619f0abd4b..dd5e1ce344 100644
--- a/src/quick/doc/src/dynamicview-tutorial.qdoc
+++ b/src/quick/doc/src/dynamicview-tutorial.qdoc
@@ -165,14 +165,14 @@ to the index of the item it was dragged over.
 To move the items within the view we use a DelegateModel.  The DelegateModel type is used by
 the view types to instantiate delegate items from model data and when constructed explicitly can
 be used to filter and re-order the model items provided to ListView.  The
-\l {QtQuick::DelegateModel::items}{items} property of DelegateModel provides access to the
+\l [QML]{DelegateModel::}{items} property of DelegateModel provides access to the
 view's items and allows us to change the visible order without modifying the source model.  To
-determine the current visible index of the items we use \l {QtQuick::DelegateModel::itemsIndex}
+determine the current visible index of the items we use \l {DelegateModel::}{itemsIndex}
 {itemsIndex} property on the DelegateModel attached property of the delegate item.
 
-To utilize a DelegateModel with a ListView we bind it to the \l {QtQuick::ListView::model}{model}
-property of the view and bind the \l {QtQuick::DelegateModel::model}{model} and
-\l {QtQuick::DelegateModel::delegate}{delegate} to the DelegateModel.
+To utilize a DelegateModel with a ListView we bind it to the \l {ListView::}{model}
+property of the view and bind the \l {DelegateModel::}{model} and
+\l {DelegateModel::}{delegate} to the DelegateModel.
 
 \snippet tutorials/dynamicview/dynamicview3/dynamicview.qml 4
 
@@ -194,7 +194,7 @@ like this:
 \section2 Walkthrough
 
 Items in a DelegateModel are filtered into groups represented by the DelegateModelGroup type,
-normally all items in the model belong to a default \l {QtQuick::DelegateModel::items}{items}
+normally all items in the model belong to a default \l {DelegateModel::}{items}
 group but this default can be changed with the includeByDefault property.  To implement our sorting
 we want items to first be added to an unsorted group from where we can transfer them to a sorted
 position in the items group.  To do that we clear includeByDefault on the items group and set it on
@@ -208,7 +208,7 @@ item and then transfer the item to the items group before moving it to the pre-d
 repeat until the unsorted group is empty.
 
 To find the insert position for an item we request a handle for the item from the unsorted group
-with the \l {QtQuick::DelegateModel::get} {get} function.  Through the model property on this
+with the \l {DelegateModel::}{get} function.  Through the model property on this
 handle we can access the same model data that is available in a delegate instance of that item and
 compare against other items to determine relative position.
 
@@ -220,7 +220,7 @@ of the list.  In this example it can be one of the following:
 \snippet tutorials/dynamicview/dynamicview4/dynamicview.qml 4
 
 A sort is triggered whenever new items are added to the unsorted DelegateModel which we are
-notified of by the \l {QtQuick::DelegateModelGroup::onChanged}{onChanged} handler.  If no sort
+notified of by the \l {DelegateModelGroup} \c onChanged handler.  If no sort
 function is currently selected we simply transfer all items from the unsorted group to the items
 group, otherwise we call sort with the selected sort function.
 
@@ -228,8 +228,8 @@ group, otherwise we call sort with the selected sort function.
 
 Finally when the selected sort order changes we can trigger a full re-sort of the list by moving
 all items from the items group to the unsorted group, which will trigger the
-\l {QtQuick::DelegateModelGroup::onChanged}{onChanged} handler and transfer the items back to the
-items group in correct order.  Note that the \l {QtQuick::DelegateModelGroup::onChanged}{onChanged}
+\l {DelegateModelGroup} \c onChanged handler and transfer the items back to the
+items group in correct order.  Note that the \l {DelegateModelGroup} \c onChanged
 handler will not be invoked recursively so there's no issue with it being invoked during a sort.
 
 \snippet tutorials/dynamicview/dynamicview4/dynamicview.qml 6
diff --git a/src/quick/doc/src/whatsnew.qdoc b/src/quick/doc/src/whatsnew.qdoc
index 017a534b4c..c41ea562f0 100644
--- a/src/quick/doc/src/whatsnew.qdoc
+++ b/src/quick/doc/src/whatsnew.qdoc
@@ -312,8 +312,8 @@ the window loses focus.
 \li VisualDataModel:
     \list
     \li Now has features to filter the items to be displayed in a view. This is supported by the new
-        \l {VisualDataModel::}{groups}, \l {VisualDataModel::}{filterOnGroup}, \l {VisualDataModel::}{items}
-        and \l {VisualDataModel::}{persistedItems} properties.
+        \l {DelegateModel::}{groups}, \l {DelegateModel::}{filterOnGroup}, \l {DelegateModel::}{items}
+        and \l {DelegateModel::}{persistedItems} properties.
     \endlist
 \li Changes common to both ListView and GridView:
     \list