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

4 files changed, 12 insertions, 10 deletions

diff --git a/doc/src/declarative/binding.qdoc b/doc/src/declarative/binding.qdoc
index 7e8933f..37b4c97 100644
--- a/doc/src/declarative/binding.qdoc
+++ b/doc/src/declarative/binding.qdoc
@@ -86,7 +86,7 @@ void setBrightness(int b)
 
 Next, make an instance of this class visible to the QML bind engine:
 \code
-QFxView *view = new QFxView;
+QmlView *view = new QmlView;
 view->setUrl("MyUI.qml");
 
 MyScreen *screen = new MyScreen;
diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index 7c293ee..028b5f0 100644
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -13,7 +13,7 @@ and to address some of the cases unique to fluid user interfaces, the QML items
 When the user presses or releases a key, the following occurs:
 \list 1
 \o Qt receives the key action and generates a key event.
-\o If the Qt widget containing the \l QFxView has focus, the key event is delivered to it. Otherwise, regular Qt key handling continues.
+\o If the Qt widget containing the \l QmlView has focus, the key event is delivered to it. Otherwise, regular Qt key handling continues.
 \o The key event is delivered by the scene to the QML \l Item with \e {active focus}.  If no \l Item has \e {active focus}, the key event is \l {QEvent::ignore()}{ignored} and regular Qt key handling continues.
 \o If the QML \l Item with \e {active focus} accepts the key event, propagation stops.  Otherwise the event is "bubbled up", by recursively passing it to each \l Item's parent until either the event is accepted, or the root \l Item is reached.
 
diff --git a/doc/src/declarative/qtprogrammers.qdoc b/doc/src/declarative/qtprogrammers.qdoc
index 742fc07..3b20539 100644
--- a/doc/src/declarative/qtprogrammers.qdoc
+++ b/doc/src/declarative/qtprogrammers.qdoc
@@ -20,7 +20,7 @@ QML provides direct access to the following concepts from Qt:
  \o QAction - the \l {basicqmlaction}{action} type
  \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 QWidget - QmlView is a QML-displaying widget
  \o Qt models - used directly in data binding (QAbstractItemModel and next generation QListModelInterface)
 \endlist
 
diff --git a/doc/src/snippets/declarative/repeater.qml b/doc/src/snippets/declarative/repeater.qml
index 309fead..f8ac856 100644
--- a/doc/src/snippets/declarative/repeater.qml
+++ b/doc/src/snippets/declarative/repeater.qml
@@ -1,14 +1,16 @@
 import Qt 4.6
 
+Rectangle {
+    width: 220; height: 20; color: "white"
+
 //! [0]
-Rectangle { width: 220; height: 20; color: "white"
-    Component { id: Dot
-        Rectangle { width: 20; height: 20; radius: 10; color: "green" }
-    }
-    HorizontalLayout {
+    Row {
         Rectangle { width: 10; height: 20; color: "red" }
-        Repeater { component: Dot; dataSource: 10 }
+        Repeater {
+            model: 10 
+            Rectangle { width: 20; height: 20; radius: 10; color: "green" }
+        }
         Rectangle { width: 10; height: 20; color: "blue" }
     }
-}
 //! [0]
+}