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

8 files changed, 22 insertions, 22 deletions

diff --git a/doc/src/declarative/advtutorial.qdoc b/doc/src/declarative/advtutorial.qdoc
index 7d2967e..8f95190 100644
--- a/doc/src/declarative/advtutorial.qdoc
+++ b/doc/src/declarative/advtutorial.qdoc
@@ -468,6 +468,6 @@ By following this tutorial you've seen how you can write a fully functional appl
 \endlist
 
 There is so much more to learn about QML that we haven't been able to cover in this tutorial. Check out all the
-demos and examples and the \l {Declarative UI (QML)}{documentation} to find out all the things you can do with QML!
+demos and examples and the \l {Declarative UI Using QML}{documentation} to find out all the things you can do with QML!
 
 */
diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc
index 6901947..8db1c35 100644
--- a/doc/src/declarative/basictypes.qdoc
+++ b/doc/src/declarative/basictypes.qdoc
@@ -43,9 +43,12 @@
   \page qdeclarativebasictypes.html
   \title QML Basic Types
 
-  QML uses a set of property types, which are primitive within QML.
-  These basic types are referenced throughout the documentation of the
-  QML elements. Almost all of them are exactly what you would expect.
+  QML has a set of primitive types, as listed below, that are used throughout
+  the \l {QML Elements}.
+
+  The simpler types in this list can also be used for defining a new
+  \c property in a component. See \l{Extending types from QML} for the
+  list of types that can be used for custom properties.
 
   \annotatedlist qmlbasictypes
 */
diff --git a/doc/src/declarative/tutorial.qdoc b/doc/src/declarative/tutorial.qdoc
index 4cfb999..75c0f851 100644
--- a/doc/src/declarative/tutorial.qdoc
+++ b/doc/src/declarative/tutorial.qdoc
@@ -57,10 +57,10 @@ The tutorial's source code is located in the $QTDIR/examples/declarative/tutoria
 
 Tutorial chapters:
 
-\list
-\o \l {QML Tutorial 1 - Basic Types}
-\o \l {QML Tutorial 2 - QML Component}
-\o \l {QML Tutorial 3 - States and Transitions}
+\list 1
+\o \l {QML Tutorial 1 - Basic Types}{Basic Types}
+\o \l {QML Tutorial 2 - QML Components}{QML Components}
+\o \l {QML Tutorial 3 - States and Transitions}{States and Transitions}
 \endlist
 
 */
@@ -125,7 +125,7 @@ bin/qml $QTDIR/examples/declarative/tutorials/helloworld/tutorial1.qml
 
 /*!
 \page qml-tutorial2.html
-\title QML Tutorial 2 - QML Component
+\title QML Tutorial 2 - QML Components
 \contentspage QML Tutorial
 \previouspage QML Tutorial 1 - Basic Types
 \nextpage QML Tutorial 3 - States and Transitions
@@ -137,7 +137,7 @@ This chapter adds a color picker to change the color of the text.
 Our color picker is made of six cells with different colors.
 To avoid writing the same code multiple times for each cell, we create a new \c Cell component.
 A component provides a way of defining a new type that we can re-use in other QML files.
-A QML component is like a black-box and interacts with the outside world through properties, signals and slots and is generally
+A QML component is like a black-box and interacts with the outside world through properties, signals and functions and is generally
 defined in its own QML file. (For more details, see \l {Defining new Components}).
 The component's filename must always start with a capital letter.
 
@@ -158,7 +158,7 @@ An \l Item is the most basic visual element in QML and is often used as a contai
 
 We declare a \c cellColor property. This property is accessible from  \e outside our component, this allows us
 to instantiate the cells with different colors.
-This property is just an alias to an existing property - the color of the rectangle that compose the cell (see \l{intro-properties}{Properties}).
+This property is just an alias to an existing property - the color of the rectangle that compose the cell (see \l{Adding new properties}).
 
 \snippet examples/declarative/tutorials/helloworld/Cell.qml 5
 
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index a0983cc..0395766 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -1632,10 +1632,6 @@ void QDeclarativeItemPrivate::parentProperty(QObject *o, void *rv, QDeclarativeN
     specify it.
  */
 
-/*!
-    \internal
-*/
-
 /*! \internal */
 QDeclarativeListProperty<QObject> QDeclarativeItemPrivate::data()
 {
@@ -1646,7 +1642,7 @@ QDeclarativeListProperty<QObject> QDeclarativeItemPrivate::data()
     \property QDeclarativeItem::childrenRect
     \brief The geometry of an item's children.
 
-    childrenRect provides an easy way to access the (collective) position and size of the item's children.
+    This property holds the (collective) position and size of the item's children.
 */
 QRectF QDeclarativeItem::childrenRect()
 {
@@ -2966,7 +2962,6 @@ void QDeclarativeItem::setFocus(bool focus)
 }
 
 /*!
-    \reimp
     \internal
 */
 void QDeclarativeItem::paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *)
@@ -2974,7 +2969,6 @@ void QDeclarativeItem::paint(QPainter *, const QStyleOptionGraphicsItem *, QWidg
 }
 
 /*!
-    \reimp
     \internal
 */
 bool QDeclarativeItem::event(QEvent *ev)
diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
index 5dd7e5d..6430fae 100644
--- a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
@@ -231,7 +231,7 @@ void QDeclarativePaintedItem::setCacheFrozen(bool frozen)
 }
 
 /*!
-    \reimp
+    \internal
 */
 void QDeclarativePaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
 {
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index b04e36e..a1fa8c6 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -828,7 +828,7 @@ void QDeclarativeTextInput::moveCursor()
 }
 
 /*!
-    \qmlmethod int xToPosition(int x)
+    \qmlmethod int TextInput::xToPosition(int x)
 
     This function returns the character position at
     x pixels from the left of the textInput. Position 0 is before the
@@ -1097,7 +1097,7 @@ QString QDeclarativeTextInput::displayText() const
 }
 
 /*!
-    \qmlmethod void moveCursorSelection(int position)
+    \qmlmethod void TextInput::moveCursorSelection(int position)
 
     Moves the cursor to \a position and updates the selection accordingly.
     (To only move the cursor, set the \l cursorPosition property.)
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index dee5ec6..ac60758 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1550,7 +1550,7 @@ QStringList QDeclarativeEngine::importPathList() const
 }
 
 /*!
-  Sets the list of directories where the engine searches for
+  Sets \a paths as the list of directories where the engine searches for
   installed modules in a URL-based directory structure.
 
   By default, the list contains the paths specified in the \c QML_IMPORT_PATH environment
diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.cpp b/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
index a0ed78f..039998f 100644
--- a/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
+++ b/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
@@ -60,6 +60,9 @@ QDeclarativePropertyValueSource::QDeclarativePropertyValueSource()
 {
 }
 
+/*!
+    Destroys the value source.
+*/
 QDeclarativePropertyValueSource::~QDeclarativePropertyValueSource()
 {
 }