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

5 files changed, 21 insertions, 18 deletions

diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index c121a2d..25c2417 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -6,8 +6,11 @@ Flickable:
    - flickingHorizontally and flickingVertically properties added
    - movingHorizontally and movingVertically properties added
    - flickDirection is renamed flickableDirection
-Component: isReady, isLoading, isError and isNull properties removed, use
-    status property instead
+Component:
+    - isReady, isLoading, isError and isNull properties removed, use
+      status property instead
+    - errorsString() renamed to errorString()
+
 QList<QObject*> models no longer provide properties in model object.  The
 properties are now updated when the object changes.  An object's property
 "foo" may now be accessed as "foo", modelData.foo" or model.modelData.foo"
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 3c0f5a2..560d586 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -415,7 +415,7 @@ void QDeclarativeFlickablePrivate::updateBeginningEnd()
     These properties are typically used to draw a scrollbar. For example:
 
     \snippet doc/src/snippets/declarative/flickableScrollbar.qml 0
-    \dots 4
+    \dots 8
     \snippet doc/src/snippets/declarative/flickableScrollbar.qml 1
 
     \sa {declarative/ui-components/scrollbar}{scrollbar example}
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 23a6f63..61283df 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1321,7 +1321,7 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
 
     \snippet doc/src/snippets/declarative/listview/ContactModel.qml 0
 
-    A ListView can display the data in the model, like this:
+    Another component can display this model data in a ListView, like this:
 
     \table 
     \row 
@@ -1332,13 +1332,13 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
     \endtable
 
     Here, the ListView creates a \c ContactModel component for its model, and a \l Text element
-    for its delegate. The view creates a new \l Text component for each item in the model. Note
+    for its delegate. The view will create a new \l Text component for each item in the model. Notice
     the delegate is able to access the model's \c name and \c number data directly.
 
     An improved list view is shown below. The delegate is visually improved and is moved 
     into a separate \c contactDelegate component. Also, the currently selected item is highlighted
     with a blue \l Rectangle using the \l highlight property, and \c focus is set to \c true
-    to enable keyboard navigation for the list.
+    to enable keyboard navigation for the list view.
     
     \table
     \row
@@ -1346,10 +1346,10 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
     \o \image listview-highlight.png
     \endtable
 
-    Delegates are instantiated as needed and may be destroyed at any time.
+    In a ListView, delegates are instantiated as needed and may be destroyed at any time.
     State should \e never be stored in a delegate.
 
-    \bold Note that views do not enable \e clip automatically.  If the view
+    \note Views do not enable \e clip automatically.  If the view
     is not clipped by another item or the screen, it will be necessary
     to set \e {clip: true} in order to have the out of view items clipped
     nicely.
@@ -1693,9 +1693,9 @@ void QDeclarativeListView::setHighlightFollowsCurrentItem(bool autoHighlight)
     \qmlproperty real ListView::preferredHighlightEnd
     \qmlproperty enumeration ListView::highlightRangeMode
 
-    These properties set the preferred range of the highlight (current item)
-    within the view. The \c preferredHighlightEnd must be greater than or equal to
-    \c preferredHighlightBegin.
+    These properties define the preferred range of the highlight (for the current item)
+    within the view. The \c preferredHighlightBegin value must be less than the
+    \c preferredHighlightEnd value. 
 
     These properties affect the position of the current item when the list is scrolled.
     For example, if the currently selected item should stay in the middle of the
@@ -1794,8 +1794,8 @@ void QDeclarativeListView::setSpacing(qreal spacing)
     Possible values:
 
     \list
-    \o ListView.Horizontal - Items are laid out horizontally.
-    \o ListView.Vertical - Items are laid out vertically. This is the default value.
+    \o ListView.Horizontal - Items are laid out horizontally
+    \o ListView.Vertical (default) - Items are laid out vertically
     \endlist
 
     \table
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index e757675..3f11425 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -246,7 +246,7 @@ QDeclarativeComponent::~QDeclarativeComponent()
     \o Component.Ready - the component has been loaded, and can be used to create instances.
     \o Component.Loading - the component is currently being loaded
     \o Component.Error - an error occurred while loading the component.
-               Calling errorsString() will provide a human-readable description of any errors.
+               Calling errorString() will provide a human-readable description of any errors.
     \endlist
  */
 
@@ -492,7 +492,7 @@ QList<QDeclarativeError> QDeclarativeComponent::errors() const
 }
 
 /*!
-    \qmlmethod string Component::errorsString()
+    \qmlmethod string Component::errorString()
 
     Returns a human-readable description of any errors.
 
@@ -504,9 +504,9 @@ QList<QDeclarativeError> QDeclarativeComponent::errors() const
 
 /*!
     \internal
-    errorsString is only meant as a way to get the errors in script
+    errorString is only meant as a way to get the errors in script
 */
-QString QDeclarativeComponent::errorsString() const
+QString QDeclarativeComponent::errorString() const
 {
     Q_D(const QDeclarativeComponent);
     QString ret;
diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h
index 688e233..1d1fca7 100644
--- a/src/declarative/qml/qdeclarativecomponent.h
+++ b/src/declarative/qml/qdeclarativecomponent.h
@@ -86,7 +86,7 @@ public:
     bool isLoading() const;
 
     QList<QDeclarativeError> errors() const;
-    Q_INVOKABLE QString errorsString() const;
+    Q_INVOKABLE QString errorString() const;
 
     qreal progress() const;