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

13 files changed, 42 insertions, 40 deletions

diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 539c1d5..2ace8de 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -520,7 +520,7 @@ in the \l{Qt for S60 Requirements} document.
         We've included a subset of the Qt demos in this package for you
         to try out. An excellent starting point is the "fluidlauncher"
         demo. To run the demo on a real device, you first have to install
-        \c{qt_for_s60.sis} and \c{fluidlauncher.sis} found in the Qt installation
+        \c{qt.sis} and \c{fluidlauncher.sis} found in the Qt installation
         directory. Begin by connecting your phone using the USB cable and
         selecting "PC Suite mode". In Windows Explorer right click on the
         \c{.sis} files and select "Install with Nokia Application Installer"
diff --git a/doc/src/exceptionsafety.qdoc b/doc/src/howtos/exceptionsafety.qdoc
index b70df6b..23bedf5 100644
--- a/doc/src/exceptionsafety.qdoc
+++ b/doc/src/howtos/exceptionsafety.qdoc
@@ -42,7 +42,7 @@
 /*!
     \page exceptionsafety.html
     \title Exception Safety
-    \ingroup architecture
+    \ingroup best-practices
     \brief A guide to exception safety in Qt.
 
     \bold {Preliminary warning}: Exception safety is not feature complete!
diff --git a/doc/src/s60-introduction.qdoc b/doc/src/platforms/s60-introduction.qdoc
index d0a1976..086ee52 100644
--- a/doc/src/s60-introduction.qdoc
+++ b/doc/src/platforms/s60-introduction.qdoc
@@ -121,8 +121,8 @@
     \row \o \c QT_SIS_OPTIONS      \o Options accepted by \c .sis creation. 
                                        -i, install the package right away using PC suite.
                                        -c=<file>, read certificate information from a file.
-                                       Execute \c{perl createpackage.pl} for more information
-                                       about options.
+                                       Execute \c{createpackage.pl} script without any 
+                                       parameters for more information about options.
                                        By default no otions are given.
     \row \o \c QT_SIS_TARGET       \o Target for which \c .sis file is created.
                                        Accepted values are build targets listed in 
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 65d335b..4c3929a 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -128,6 +128,8 @@
                                      \o Intel Compiler
     \row    \o Embedded Linux QWS (Mips, PowerPC)
                                      \o gcc (\l{http:\\www.codesourcery.com}{Codesourcery version)}
+    \row    \o Embedded Linux X11 (ARM)
+                                     \o gcc (\l{http://www.scratchbox.org/}{Scratchbox)}
     \row    \o Windows CE 6.0 (ARMv4i, x86, MIPS)
                                      \o MSVC 2008 WinCE 6.0 Professional
     \endtable
diff --git a/doc/src/symbian-exceptionsafety.qdoc b/doc/src/platforms/symbian-exceptionsafety.qdoc
index 88f4d03..88f4d03 100644
--- a/doc/src/symbian-exceptionsafety.qdoc
+++ b/doc/src/platforms/symbian-exceptionsafety.qdoc
diff --git a/doc/src/snippets/declarative/GroupBox.qml b/doc/src/snippets/declarative/GroupBox.qml
index 13e7eb6..6c5431e 100644
--- a/doc/src/snippets/declarative/GroupBox.qml
+++ b/doc/src/snippets/declarative/GroupBox.qml
@@ -1,12 +1,12 @@
 import Qt 4.6
 
 ContentWrapper {
-    id: Container; width: parent.width; height: contents.height
+    id: container; width: parent.width; height: contents.height
     children: [
         Rectangle {
             width: parent.width; height: contents.height
             color: "white"; pen.width: 2; pen.color: "#adaeb0"; radius: 10
-            VerticalLayout {
+            Column {
                 id: layout; width: parent.width; margin: 5; spacing: 2
                 Content { }
             }
diff --git a/doc/src/snippets/declarative/gridview/dummydata/ContactModel.qml b/doc/src/snippets/declarative/gridview/dummydata/ContactModel.qml
index 6868385..3cf9ba7 100644
--- a/doc/src/snippets/declarative/gridview/dummydata/ContactModel.qml
+++ b/doc/src/snippets/declarative/gridview/dummydata/ContactModel.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 ListModel {
-    id: ContactModel
+    id: contactModel
     ListElement {
         name: "Bill Smith"
         number: "555 3264"
diff --git a/doc/src/snippets/declarative/gridview/gridview.qml b/doc/src/snippets/declarative/gridview/gridview.qml
index d0f0623..1a2021c 100644
--- a/doc/src/snippets/declarative/gridview/gridview.qml
+++ b/doc/src/snippets/declarative/gridview/gridview.qml
@@ -11,11 +11,11 @@ Rectangle {
     // instantiated for each visible item in the list.
 //! [0]
     Component {
-        id: Delegate
+        id: delegate
         Item {
-            id: Wrapper
+            id: wrapper
             width: 80; height: 78
-            VerticalLayout {
+            Column {
                 Image { source: portrait; anchors.horizontalCenter: parent.horizontalCenter }
                 Text { text: name; anchors.horizontalCenter: parent.horizontalCenter }
             }
@@ -26,7 +26,7 @@ Rectangle {
     // by each ListView and placed behind the current item.
 //! [1]
     Component {
-        id: Highlight
+        id: highlight
         Rectangle {
             color: "lightsteelblue"
             radius: 5
@@ -37,9 +37,9 @@ Rectangle {
 //! [2]
     GridView {
         width: parent.width; height: parent.height
-        model: ContactModel; delegate: Delegate
+        model: ContactModel; delegate: delegate
         cellWidth: 80; cellHeight: 80
-        highlight: Highlight
+        highlight: highlight
         focus: true
     }
 //! [2]
diff --git a/doc/src/snippets/declarative/listview/highlight.qml b/doc/src/snippets/declarative/listview/highlight.qml
index 97eac45..2234ee7 100644
--- a/doc/src/snippets/declarative/listview/highlight.qml
+++ b/doc/src/snippets/declarative/listview/highlight.qml
@@ -11,9 +11,9 @@ Rectangle {
     // instantiated for each visible item in the list.
 //! [0]
     Component {
-        id: Delegate
+        id: delegate
         Item {
-            id: Wrapper
+            id: wrapper
             width: 180; height: 40
             Column {
                 x: 5; y: 5
@@ -28,22 +28,22 @@ Rectangle {
     // highlight moves to the current item.
 //! [1]
     Component {
-        id: Highlight
+        id: highlight
         Rectangle {
             width: 180; height: 40
             color: "lightsteelblue"; radius: 5
             y: SpringFollow {
-                source: List.currentItem.y
+                source: list.currentItem.y
                 spring: 3
                 damping: 0.2
             }
         }
     }
     ListView {
-        id: List
+        id: list
         width: parent.height; height: parent.height
-        model: ContactModel; delegate: Delegate
-        highlight: Highlight
+        model: ContactModel; delegate: delegate
+        highlight: highlight
         highlightFollowsCurrentItem: false
         focus: true
     }
diff --git a/doc/src/snippets/declarative/listview/listview.qml b/doc/src/snippets/declarative/listview/listview.qml
index c907077..be0f3ad 100644
--- a/doc/src/snippets/declarative/listview/listview.qml
+++ b/doc/src/snippets/declarative/listview/listview.qml
@@ -12,11 +12,11 @@ Rectangle {
     // instantiated for each visible item in the list.
 //! [0]
     Component {
-        id: Delegate
+        id: delegate
         Item {
-            id: Wrapper
+            id: wrapper
             width: 180; height: 40
-            VerticalLayout {
+            Column {
                 x: 5; y: 5
                 Text { text: '<b>Name:</b> ' + name }
                 Text { text: '<b>Number:</b> ' + number }
@@ -28,7 +28,7 @@ Rectangle {
     // by each ListView and placed behind the current item.
 //! [1]
     Component {
-        id: Highlight
+        id: highlight
         Rectangle {
             color: "lightsteelblue"
             radius: 5
@@ -40,8 +40,8 @@ Rectangle {
     ListView {
         width: parent.width; height: parent.height
         model: ContactModel
-        delegate: Delegate
-        highlight: Highlight
+        delegate: delegate
+        highlight: highlight
         focus: true
     }
 //! [2]
diff --git a/doc/src/snippets/declarative/pathview/pathattributes.qml b/doc/src/snippets/declarative/pathview/pathattributes.qml
index 92d6966..19a192c 100644
--- a/doc/src/snippets/declarative/pathview/pathattributes.qml
+++ b/doc/src/snippets/declarative/pathview/pathattributes.qml
@@ -5,22 +5,22 @@ Rectangle {
 //! [0]
 //! [1]
     Component {
-        id: Delegate
+        id: delegate
         Item {
-            id: Wrapper
+            id: wrapper
             width: 80; height: 80
             scale: PathView.scale
             opacity: PathView.opacity
-            VerticalLayout {
-                Image { anchors.horizontalCenter: Name.horizontalCenter; width: 64; height: 64; source: icon }
-                Text { id: Name; text: name; font.pointSize: 16}
+            Column {
+                Image { anchors.horizontalCenter: name.horizontalCenter; width: 64; height: 64; source: icon }
+                Text { id: name; text: name; font.pointSize: 16}
             }
         }
     }
 //! [1]
 //! [2]
     PathView {
-        anchors.fill: parent; model: MenuModel; delegate: Delegate
+        anchors.fill: parent; model: MenuModel; delegate: delegate
         path: Path {
             startX: 120; startY: 100
             PathAttribute { name: "scale"; value: 1.0 }
diff --git a/doc/src/snippets/declarative/pathview/pathview.qml b/doc/src/snippets/declarative/pathview/pathview.qml
index 004a1d2..5605139 100644
--- a/doc/src/snippets/declarative/pathview/pathview.qml
+++ b/doc/src/snippets/declarative/pathview/pathview.qml
@@ -5,20 +5,20 @@ Rectangle {
 //! [0]
 //! [1]
     Component {
-        id: Delegate
+        id: delegate
         Item {
-            id: Wrapper
+            id: wrapper
             width: 80; height: 80
-            VerticalLayout {
-                Image { anchors.horizontalCenter: Name.horizontalCenter; width: 64; height: 64; source: icon }
-                Text { id: Name; text: name; font.pointSize: 16}
+            Column {
+                Image { anchors.horizontalCenter: name.horizontalCenter; width: 64; height: 64; source: icon }
+                Text { id: name; text: name; font.pointSize: 16}
             }
         }
     }
 //! [1]
 //! [2]
     PathView {
-        anchors.fill: parent; model: MenuModel; delegate: Delegate
+        anchors.fill: parent; model: MenuModel; delegate: delegate
         path: Path {
             startX: 120; startY: 100
             PathQuad { x: 120; y: 25; controlX: 260; controlY: 75 }
diff --git a/doc/src/snippets/statemachine/main2.cpp b/doc/src/snippets/statemachine/main2.cpp
index d882400..2419dc2 100644
--- a/doc/src/snippets/statemachine/main2.cpp
+++ b/doc/src/snippets/statemachine/main2.cpp
@@ -57,7 +57,7 @@ int main(int argv, char **args)
 //![0]
 
 //![2]
-    s12>addTransition(quitButton, SIGNAL(clicked()), s12);
+    s12->addTransition(quitButton, SIGNAL(clicked()), s12);
 //![2]
 
 //![1]
@@ -71,7 +71,7 @@ int main(int argv, char **args)
   QButton *interruptButton = new QPushButton("Interrupt Button");
 
 //![3]
-    QHistoryState *s1h = s1->addHistoryState();
+    QHistoryState *s1h = new QHistoryState(s1);
 
     QState *s3 = new QState();
     s3->assignProperty(label, "text", "In s3");