Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

5 files changed, 6 insertions, 5 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index 018bd55..229e15b 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -70,11 +70,11 @@ QT_BEGIN_NAMESPACE
     \endlist
 
     Examples:
-    \snippet snippets/declarative/border-image.qml 0
+    \snippet snippets/declarative/borderimage.qml 0
 
     \image BorderImage.png
 
-    The \l{declarative/border-image}{BorderImage example} shows how a BorderImage can be used to simulate a shadow effect on a
+    The \l{declarative/imageelements/borderimage}{BorderImage example} shows how a BorderImage can be used to simulate a shadow effect on a
     rectangular item.
  */
 
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index a03a51d..3c0f5a2 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -418,7 +418,7 @@ void QDeclarativeFlickablePrivate::updateBeginningEnd()
     \dots 4
     \snippet doc/src/snippets/declarative/flickableScrollbar.qml 1
 
-    \sa {declarative/scrollbar}{scrollbar example}
+    \sa {declarative/ui-components/scrollbar}{scrollbar example}
 */
 
 QDeclarativeFlickable::QDeclarativeFlickable(QDeclarativeItem *parent)
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index 88e8520..fe642e0 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -57,6 +57,7 @@ QT_BEGIN_NAMESPACE
     An Image element displays a specified \l source image:
 
     \table
+    \row
     \o
     \image declarative-qtlogo.png
     \o
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index bd4c386..936f9b0 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1908,7 +1908,7 @@ void QDeclarativeListView::setCacheBuffer(int b)
     pet.  The section expression is the size property.  If \c ListView.section and
     \c ListView.prevSection differ, the item will display a section header.
 
-    \snippet examples/declarative/listview/sections.qml 0
+    \snippet examples/declarative/modelviews/listview/sections.qml 0
 
     \image ListViewSections.png
 */
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 054fefd..db480b1 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmlclass TextInput QDeclarativeTextInput
   \since 4.7
-    The TextInput item allows you to add an editable line of text to a scene.
+    \brief The TextInput item allows you to add an editable line of text to a scene.
 
     TextInput can only display a single line of text, and can only display
     plain text. However it can provide addition input constraints on the text.