summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2011-11-24 16:13:05 (GMT)
committerCasper van Donderen <casper.vandonderen@nokia.com>2011-11-24 16:13:05 (GMT)
commit7163a8c4644a91260c205fc5fe68dc8bb8aa5da2 (patch)
tree991f6230126025d94d9551e4330ad174ca252ad5
parentaa892599c7e3bf5ca2271712b9bca7ddaab6707e (diff)
downloadQt-7163a8c4644a91260c205fc5fe68dc8bb8aa5da2.zip
Qt-7163a8c4644a91260c205fc5fe68dc8bb8aa5da2.tar.gz
Qt-7163a8c4644a91260c205fc5fe68dc8bb8aa5da2.tar.bz2
Fixes for the manifest and links.
-rw-r--r--doc/src/examples/qml-examples.qdoc10
-rw-r--r--src/declarative/graphicsitems/qdeclarativelistview.cpp6
2 files changed, 7 insertions, 9 deletions
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 45d73c9..fd60300 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -342,8 +342,6 @@
Click on the grey button shown at the bottom of the example to
enable or disable the layout mirroring.
- \depends helper/qmlapplicationviewer
-
\image qml-righttoleft-layoutmirroring-example.png
\sa {QML Right-to-left User Interfaces}
@@ -395,7 +393,7 @@
\page qml-listview-examples.html
\list
- \o \l {Models and Views: ListView Example}
+ \o \l {Models and Views: Dynamic List ListView Example}
\o \l {Models and Views: Expanding Delegate ListView Example}
\o \l {Models and Views: Highlight ListView Example}
\o \l {Models and Views: Highlight Ranges ListView Example}
@@ -405,8 +403,8 @@
*/
/*!
- \title Models and Views: ListView Example
- \example declarative/modelviews/listview
+ \title Models and Views: Dynamic List ListView Example
+ \example declarative/modelviews/listview/dynamiclist
\depends helper/qmlapplicationviewer
\brief This example shows how items can be dynamically added to
@@ -565,7 +563,7 @@
*/
/*!
\title Models and Views: Alert WebView Example
- \example declarative/modelviews/webview
+ \example declarative/modelviews/webview/alerts
\depends helper/qmlapplicationviewer
\brief These examples show how to use the WebView element.
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 7b4dc5c..ef7e25f 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1628,7 +1628,7 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
to set \e {clip: true} in order to have the out of view items clipped
nicely.
- \sa {QML Data Models}, GridView, {declarative/modelviews/listview}{ListView examples}
+ \sa {QML Data Models}, GridView, {Models and Views: ListView Examples}{ListView examples}
*/
QDeclarativeListView::QDeclarativeListView(QDeclarativeItem *parent)
@@ -1956,7 +1956,7 @@ int QDeclarativeListView::count() const
so as to stay with the current item, unless the highlightFollowsCurrentItem
property is false.
- \sa highlightItem, highlightFollowsCurrentItem, {declarative/modelviews/listview}{ListView examples}
+ \sa highlightItem, highlightFollowsCurrentItem, {Models and Views: ListView Examples}{ListView examples}
*/
QDeclarativeComponent *QDeclarativeListView::highlight() const
{
@@ -2344,7 +2344,7 @@ void QDeclarativeListView::setCacheBuffer(int b)
differing sections will result in a section header being created
even if that section exists elsewhere.
- \sa {declarative/modelviews/listview}{ListView examples}
+ \sa {Models and Views: ListView Examples}{ListView examples}
*/
QDeclarativeViewSection *QDeclarativeListView::sectionCriteria()
{