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

13 files changed, 16 insertions, 14 deletions

diff --git a/doc/src/declarative/cppitem.qdoc b/doc/src/declarative/cppitem.qdoc
index 4543156..38da0fb 100644
--- a/doc/src/declarative/cppitem.qdoc
+++ b/doc/src/declarative/cppitem.qdoc
@@ -94,7 +94,7 @@ You can create a new type of QML item by:
 To add a new type, you first must add a new C++ class derived from QFxItem.
 You may of course extend existing QFxItem subclasses.
 
-One existing subclass is QFxPainted, which provides
+One existing subclass is QFxPaintedItem, which provides
 a simple cached-image painting model.
 
 \section2 Reimplementing paint functions
@@ -105,11 +105,11 @@ Two alternative painters are available, offering
 different levels of performance and functionality:
 QPainter, GLPainter.
 
-You can choose to subclass QFxPainted rather than QFxItem,
+You can choose to subclass QFxPaintedItem rather than QFxItem,
 and then implement the virtual method:
 
 \code
-    void paint(QPainter *painter);
+    void drawContents(QPainter *painter, const QRect &rect);
 \endcode
 
 This paints into an offscreen pixmap which is then painted to the display (transformed,
diff --git a/doc/src/declarative/qmlforcpp.qdoc b/doc/src/declarative/qmlforcpp.qdoc
index 5838df7..ab456e5 100644
--- a/doc/src/declarative/qmlforcpp.qdoc
+++ b/doc/src/declarative/qmlforcpp.qdoc
@@ -15,6 +15,8 @@
     either for the first time at startup or subsequently thereafter - the 
     property is automatically updated with the new value.
 
+    \tableofcontents
+
     \section1 Loading and using QML Files
 
     QmlComponent is used to load a QML file and to create object instances.
diff --git a/examples/declarative/extending/adding/example.qml b/examples/declarative/extending/adding/example.qml
index ba7af7a..c608f94 100644
--- a/examples/declarative/extending/adding/example.qml
+++ b/examples/declarative/extending/adding/example.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import People 1.0
 
 // ![0]
 Person {
diff --git a/examples/declarative/extending/attached/example.qml b/examples/declarative/extending/attached/example.qml
index 20233f6..952eb93 100644
--- a/examples/declarative/extending/attached/example.qml
+++ b/examples/declarative/extending/attached/example.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import People 1.0
 
 BirthdayParty {
     celebrant: Boy {
diff --git a/examples/declarative/extending/binding/example.qml b/examples/declarative/extending/binding/example.qml
index cedb8bd..1651b7a 100644
--- a/examples/declarative/extending/binding/example.qml
+++ b/examples/declarative/extending/binding/example.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import People 1.0
 
 // ![0]
 BirthdayParty {
diff --git a/examples/declarative/extending/coercion/example.qml b/examples/declarative/extending/coercion/example.qml
index 5090782..64d26b0 100644
--- a/examples/declarative/extending/coercion/example.qml
+++ b/examples/declarative/extending/coercion/example.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import People 1.0
 
 // ![0]
 BirthdayParty {
diff --git a/examples/declarative/extending/default/example.qml b/examples/declarative/extending/default/example.qml
index 5fe693a..58035f9 100644
--- a/examples/declarative/extending/default/example.qml
+++ b/examples/declarative/extending/default/example.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import People 1.0
 
 // ![0]
 BirthdayParty {
diff --git a/examples/declarative/extending/extended/example.qml b/examples/declarative/extending/extended/example.qml
index a276211..985ce20 100644
--- a/examples/declarative/extending/extended/example.qml
+++ b/examples/declarative/extending/extended/example.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import People 1.0
 
 // ![0]
 QLineEdit {
diff --git a/examples/declarative/extending/extended/lineedit.cpp b/examples/declarative/extending/extended/lineedit.cpp
index fe4fdc3..f11d22e 100644
--- a/examples/declarative/extending/extended/lineedit.cpp
+++ b/examples/declarative/extending/extended/lineedit.cpp
@@ -63,4 +63,4 @@ int LineEditExtension::setBottomMargin(int m)
 }
 
 QML_DECLARE_TYPE(QLineEdit);
-QML_DEFINE_EXTENDED_TYPE(QLineEdit, QLineEdit, LineEditExtension);
+QML_DEFINE_EXTENDED_TYPE(People, 1, 0, 0, QLineEdit, QLineEdit, LineEditExtension);
diff --git a/examples/declarative/extending/grouped/example.qml b/examples/declarative/extending/grouped/example.qml
index 1be7abe..55912ed 100644
--- a/examples/declarative/extending/grouped/example.qml
+++ b/examples/declarative/extending/grouped/example.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import People 1.0
 
 // ![0]
 BirthdayParty {
diff --git a/examples/declarative/extending/properties/example.qml b/examples/declarative/extending/properties/example.qml
index 326105a..9594a84 100644
--- a/examples/declarative/extending/properties/example.qml
+++ b/examples/declarative/extending/properties/example.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import People 1.0
 
 // ![0]
 BirthdayParty {
diff --git a/examples/declarative/extending/signal/example.qml b/examples/declarative/extending/signal/example.qml
index 1cbaab4..e46bf32 100644
--- a/examples/declarative/extending/signal/example.qml
+++ b/examples/declarative/extending/signal/example.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import People 1.0
 
 // ![0]
 BirthdayParty {
diff --git a/examples/declarative/extending/valuesource/example.qml b/examples/declarative/extending/valuesource/example.qml
index aba2796..6d47350 100644
--- a/examples/declarative/extending/valuesource/example.qml
+++ b/examples/declarative/extending/valuesource/example.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import People 1.0
 
 // ![0]
 BirthdayParty {