Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

3 files changed, 4 insertions, 8 deletions

diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index bb54852..e5c181d 100644
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -50,7 +50,7 @@ An \l Item requests focus by setting the \c {Item::focus} property to true.
 
 For very simple cases simply setting the \c {Item::focus} property is sometimes
 sufficient.  If we run the following example in the \c qmlviewer, we see that
-the \c {<KeyActions/>} element has \e {active focus} and pressing the
+the \c {KeyActions} element has \e {active focus} and pressing the
 \e A, \e B, or \e C keys modifies the text appropriately.
 
 \table
@@ -244,7 +244,7 @@ property.  As the \l ListView is a \e {focus realm}, this doesn't effect the
 rest of the application.  However, if the \l ListView itself has 
 \e {active focus} this causes the delegate itself to receive \e {active focus}.
 In this example, the root element of the delegate is also a \e {focus realm},
-which in turn gives \e {active focus} to the \c {<KeyActions/>} element that
+which in turn gives \e {active focus} to the \c {KeyActions} element that
 actually performs the work of handling the \e {Return} key.
 
 All of the fluid UI view classes, such as \l PathView and \l GridView, behave
diff --git a/doc/src/qmlviewer.qdoc b/doc/src/declarative/qmlviewer.qdoc
index e8fdec4..8228737 100644
--- a/doc/src/qmlviewer.qdoc
+++ b/doc/src/declarative/qmlviewer.qdoc
@@ -68,11 +68,7 @@
     that is a qreal from 0 to 86400 representing the number of seconds since
     midnight, dummy data for this could be provided by \c dummydata/clock.qml:
     \code
-        <Object>
-            <properties>
-                <Property name="time" value="12345"/>
-            </properties>
-        </Object>
+    Object { property real time: 12345 }
     \endcode
     Any QML can be used in the dummy data files. You could even animate the
     fictional data!
diff --git a/doc/src/declarative/qtprogrammers.qdoc b/doc/src/declarative/qtprogrammers.qdoc
index b63ebbb..a79c671 100644
--- a/doc/src/declarative/qtprogrammers.qdoc
+++ b/doc/src/declarative/qtprogrammers.qdoc
@@ -18,7 +18,7 @@ QML provides direct access to the following concepts from Qt:
  \o QObject signals and slots - available as functions to call in JavaScript
  \o QObject properties - available as variables in JavaScript
  \o QWidget - QFxView is a QML-displaying widget
- \o Qt models - used directly in data binding (currently only next generation QListModelInterface)
+ \o Qt models - used directly in data binding (QAbstractItemModel and next generation QListModelInterface)
 \endlist
 
 Qt knowledge is \e required for \l {cppitem}{writing elements in C++}.