diff options
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 3 | ||||
| -rw-r--r-- | src/declarative/fx/qfxlistview.cpp | 10 | ||||
| -rw-r--r-- | src/declarative/util/qmleasefollow.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/util/qmlspringfollow.cpp | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index ca17fda..1fe4892 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -36,7 +36,7 @@ The following table lists the QML elements provided by the Qt Declarative module \o \l ParentAction \o \l ScriptAction \o \l Transition -\o \l Follow +\o \l SpringFollow \o \l EaseFollow \o \l Behavior \endlist @@ -86,7 +86,6 @@ The following table lists the QML elements provided by the Qt Declarative module \list \o \l MouseRegion \o \l FocusScope -\o \l KeyProxy \endlist \o diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp index 015eacf..5de9bf3 100644 --- a/src/declarative/fx/qfxlistview.cpp +++ b/src/declarative/fx/qfxlistview.cpp @@ -831,8 +831,9 @@ void QFxListViewPrivate::fixupX() \inherits Flickable \brief The ListView item provides a list view of items provided by a model. - The model is typically provided by a QAbstractListModel "C++ model object", but can also be created directly in QML. - The items are laid out vertically or horizontally and may be flicked to scroll. + The model is typically provided by a QAbstractListModel "C++ model object", + but can also be created directly in QML. The items are laid out vertically + or horizontally and may be flicked to scroll. The below example creates a very simple vertical list, using a QML model. \image trivialListView.png @@ -871,9 +872,10 @@ QFxListView::~QFxListView() The model provides a set of data that is used to create the items for the view. For large or dynamic datasets the model is usually provided by a C++ model object. The C++ model object must be a \l - {QAbstractItemModel} subclass, a VisualModel, or a simple list. + {QAbstractItemModel} subclass or a simple list. - Models can also be created directly in QML, using a \l{ListModel} or \l{XmlListModel}. + Models can also be created directly in QML, using a \l{ListModel}, + \l{XmlListModel} or \l{VisualItemModel}. */ QVariant QFxListView::model() const { diff --git a/src/declarative/util/qmleasefollow.cpp b/src/declarative/util/qmleasefollow.cpp index b58ad14..860c63a 100644 --- a/src/declarative/util/qmleasefollow.cpp +++ b/src/declarative/util/qmleasefollow.cpp @@ -242,6 +242,8 @@ Rectangle { Keys.onDownPressed: Rect1.y = Rect1.y + 100 } \endcode + + \sa SpringFollow */ QmlEaseFollow::QmlEaseFollow(QObject *parent) diff --git a/src/declarative/util/qmlspringfollow.cpp b/src/declarative/util/qmlspringfollow.cpp index 8c902aa..2dae448 100644 --- a/src/declarative/util/qmlspringfollow.cpp +++ b/src/declarative/util/qmlspringfollow.cpp @@ -236,6 +236,8 @@ void QmlSpringFollowPrivate::stop() y: SpringFollow { source: Rect1.y; velocity: 200 } } \endcode + + \sa EaseFollow */ QmlSpringFollow::QmlSpringFollow(QObject *parent) |