From 4bb9519dc2d3622b7eaed5ff7c350e414a1a2fe4 Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@digia.com>
Date: Wed, 29 May 2013 09:46:20 +0200
Subject: [PATCH] Doc: Fix links for ListModel and ListElement types
Link to documentation under QtQml module.
Change-Id: Id65d237558c235dcdda8ab206eddef23c2886a29
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
---
src/qml/types/qqmllistmodel.cpp | 8 ++++++--
src/quick/doc/src/qmltypereference.qdoc | 6 +++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
index 9277b6ea8f..5ddc0f52bd 100644
--- a/src/qml/types/qqmllistmodel.cpp
+++ b/src/qml/types/qqmllistmodel.cpp
@@ -1431,7 +1431,9 @@ QQmlListModelParser::ListInstruction *QQmlListModelParser::ListModelData::instru
The ListModel is a simple container of ListElement definitions, each containing data roles.
The contents can be defined dynamically, or explicitly in QML.
- This type is also available in the \c {QtQuick 2} import. For full documentation, see \l QtQuick2::ListModel
+ This type is also available in the \c {QtQuick 2} import.
+
+ \sa {QtQml2::ListModel}{Full documentation for ListModel}
*/
/*!
\qmltype ListModel
@@ -2540,7 +2542,9 @@ bool QQmlListModelParser::definesEmptyList(const QString &s)
List elements are defined inside ListModel definitions, and represent items in a list.
- This type is also available in the \c {QtQuick 2} import. For full documentation, see \l QtQuick2::ListElement
+ This type is also available in the \c {QtQuick 2} import.
+
+ \sa {QtQml2::ListElement}{Full documentation for ListElement}
*/
/*!
\qmltype ListElement
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index d580ba8c96..bb488ac2f2 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -236,11 +236,11 @@ Animation paths
Models And Model Data
\list
-\li \l {QtQuick2::ListModel}{ListModel} - Defines a list of data
-\li \l {QtQuick2::ListElement}{ListElement} - Defines a data item in a \l {QtQuick2::ListModel}{ListModel}
+\li \l {QtQml2::ListModel}{ListModel} - Defines a list of data
+\li \l {QtQml2::ListElement}{ListElement} - Defines a data item in a \l {QtQml2::ListModel}{ListModel}
\li \l {VisualItemModel} - Contains items that already defines its own visual delegate
\li \l {VisualDataModel} - Encapsulates a model and a delegate
-\li \l {VisualDataGroup} -Encapsulates a filtered set of visual data items
+\li \l {VisualDataGroup} - Encapsulates a filtered set of visual data items
\li \l {XmlListModel} - Specifies a model using XPath expressions
\li \l {XmlRole} - Specifies a role for an \l {XmlListModel}
\endlist
--
GitLab