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

23 files changed, 139 insertions, 65 deletions

diff --git a/doc/src/declarative/advtutorial2.qdoc b/doc/src/declarative/advtutorial2.qdoc
index dcc7c70..2aa68f3 100644
--- a/doc/src/declarative/advtutorial2.qdoc
+++ b/doc/src/declarative/advtutorial2.qdoc
@@ -48,7 +48,7 @@ first thing to do is to generate all of the blocks. Now we need to dynamically
 generate all of these blocks, because you have a new, random set of blocks
 every time. As they are dynamically generated every time the new game button is
 clicked, as opposed to on startup, we will be dynamically generating the blocks
-in the ECMAScript, as opposed to using a \l Repeater.
+in the JavaScript, as opposed to using a \l Repeater.
 
 This adds enough script to justify a new file, \c{samegame.js}, the intial version
 of which is shown below
@@ -62,7 +62,7 @@ The \c createBlock function is a lot bigger, and I'll explain it block by block.
 First we ensure that the component has been constructed. QML elements, including composite ones like the \c Block.qml
 that we've written, are never created directly in script. While there is a function to parse and create an arbitrary QML string,
 in the case where you are repeatedly creating the same item you will want to use the \c createComponent function. \c createComponent is
-a built-in function in the declarative ECMAScript, and returns a component object.
+a built-in function in the declarative JavaScript, and returns a component object.
 A component object prepares and stores a QML element (usually a composite element) for easy and efficient use.
 When the component is ready, you can create a new instance of the loaded QML with the \c createObject method.
 If the component is loaded remotely (over HTTP for example) then you will have to wait for the component to finish loading
diff --git a/doc/src/declarative/anchor-layout.qdoc b/doc/src/declarative/anchor-layout.qdoc
index 4766236..2bd0ec5 100644
--- a/doc/src/declarative/anchor-layout.qdoc
+++ b/doc/src/declarative/anchor-layout.qdoc
@@ -87,8 +87,8 @@ By specifying multiple horizontal or vertical anchors you can control the size o
 
 \code
 Rectangle { id: rect1; x: 0; ... }
-Rectangle { id: rect2; anchors.left: rect1.right; anchors.right: Rect3.left; ... }
-Rectangle { id: Rect3; x: 150; ... }
+Rectangle { id: rect2; anchors.left: rect1.right; anchors.right: rect3.left; ... }
+Rectangle { id: rect3; x: 150; ... }
 \endcode
 
 \image edge4.png
@@ -99,11 +99,11 @@ For performance reasons, you can only anchor an item to its siblings and direct
 
 \badcode
 Item {
-    id: Group1
+    id: group1
     Rectangle { id: rect1; ... }
 }
 Item {
-    id: Group2
+    id: group2
     Rectangle { id: rect2; anchors.left: rect1.right; ... }    // invalid anchor!
 }
 \endcode
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index ae64361..8228c11 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -55,8 +55,8 @@ language, and a rich set of \l {QML Elements}{QML elements} that can be used
 from QML.
 
 QML is an extension to \l {http://www.ecma-international.org/publications/standards/Ecma-262.htm}
-{ECMAScript}, that provides a mechanism to declaratively build an object tree
-of QML elements.  QML improves the integration between ECMAScript and Qt's
+{JavaScript}, that provides a mechanism to declaratively build an object tree
+of QML elements.  QML improves the integration between JavaScript and Qt's
 existing QObject based type system, adds support for automatic
 \l {Property Binding}{property bindings} and provides \l {Network Transparency}{network transparency} at the language
 level.
@@ -83,7 +83,7 @@ completely new applications.  QML is fully \l {Extending QML}{extensible from C+
 \list
 \o \l {QML Documents}
 \o \l {Property Binding}
-\o \l {ECMAScript Blocks}
+\o \l {JavaScript Blocks}
 \o \l {QML Scope}
 \o \l {Network Transparency}
 \o \l {Data Models}
diff --git a/doc/src/declarative/dynamicobjects.qdoc b/doc/src/declarative/dynamicobjects.qdoc
index c8ea981..fede2cd 100644
--- a/doc/src/declarative/dynamicobjects.qdoc
+++ b/doc/src/declarative/dynamicobjects.qdoc
@@ -44,13 +44,13 @@
 \title Dynamic Object Creation
 
 QML has some support for dynamically loading and managing QML objects from
-within ECMAscript blocks. It is preferable to use the existing QML elements for
+within Javascript blocks. It is preferable to use the existing QML elements for
 dynamic object management wherever possible; these are \l{Loader}, 
 \l{Repeater}, \l{ListView}, \l{GridView} and \l{PathView}. It is also possible 
 to dynamically create and manage objects from C++, and this is preferable for 
 hybrid QML/C++ applications - see \l{Using QML in C++ Applications}.
 Dynamically creating and managing objects from 
-within ECMAscript blocks is intended for when none of the existing QML elements 
+within Javascript blocks is intended for when none of the existing QML elements 
 fit the needs of your application, and you do not desire for your application 
 to involve C++ code.
 
diff --git a/doc/src/declarative/example-slideswitch.qdoc b/doc/src/declarative/example-slideswitch.qdoc
index 492a8ea..41a8574 100644
--- a/doc/src/declarative/example-slideswitch.qdoc
+++ b/doc/src/declarative/example-slideswitch.qdoc
@@ -108,7 +108,7 @@ For more information on states see \l{qmlstates}{QML States}.
 
 \section2 Functions
 
-We add two ECMAScript functions to our switch:
+We add two JavaScript functions to our switch:
 
 \snippet examples/declarative/slideswitch/content/Switch.qml 2
 
@@ -121,7 +121,7 @@ states (\e on and \e off).
 This second function is called when the knob is released and we want to make sure that the knob does not end up between states
 (neither \e on nor \e off). If it is the case call the \c toggle() function otherwise we do nothing.
 
-For more information on scripts see \l{qmlecmascript.html}{ECMAScript Blocks}.
+For more information on scripts see \l{qmlecmascript.html}{JavaScript Blocks}.
 
 \section2 Transition
 \snippet examples/declarative/slideswitch/content/Switch.qml 7
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index 893838f..42b054f 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -380,11 +380,11 @@ implement the rsvp attached property.
 \snippet examples/declarative/extending/signal/example.qml 0
 \snippet examples/declarative/extending/signal/example.qml 1
 
-The QML snippet shown above associates the evaluation of a ECMAScript expression
+The QML snippet shown above associates the evaluation of a JavaScript expression
 with the emission of a Qt signal.
 
 All Qt signals on a registered class become available as special "signal
-properties" within QML to which the user can assign a single ECMAScript
+properties" within QML to which the user can assign a single JavaScript
 expression.  The signal property's name is a transformed version of the Qt
 signal name: "on" is prepended, and the first letter of the signal name upper
 cased.  For example, the signal used in the example above has the following
@@ -464,7 +464,7 @@ HappyBirthday's name property remains up to date with the celebrant.
 
 Property binding is a core feature of QML.  In addition to assigning literal
 values, property bindings allow the developer to assign an arbitrarily complex
-ECMAScript expression that may include dependencies on other property values.
+JavaScript expression that may include dependencies on other property values.
 Whenever the expression's result changes - through a change in one of its
 constituent values - the expression is automatically reevaluated and
 the new result assigned to the property.
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index b26f223..764552a 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -43,7 +43,7 @@
 \page qmlglobalobject.html
 \title QML Global Object
 
-Contains all the properties of the ECMAScript global object, plus:
+Contains all the properties of the JavaScript global object, plus:
 
 \tableofcontents
 
diff --git a/doc/src/declarative/ecmascriptblocks.qdoc b/doc/src/declarative/javascriptblocks.qdoc
index 749111f..9c72a9c 100644
--- a/doc/src/declarative/ecmascriptblocks.qdoc
+++ b/doc/src/declarative/javascriptblocks.qdoc
@@ -40,23 +40,23 @@
 ****************************************************************************/
 
 /*!
-\page qmlecmascript.html
-\title ECMAScript Blocks
+\page qmljavascript.html
+\title JavaScript Blocks
 
 QML encourages building UIs declaratively, using \l {Property Binding} and the 
 composition of existing \l {QML Elements}.  If imperative code is required to implement 
-more advanced behavior, the \l Script element can be used to add ECMAScript code directly 
-to a QML file, or to include an external ECMAScript file.
+more advanced behavior, the \l Script element can be used to add JavaScript code directly 
+to a QML file, or to include an external JavaScript file.
 
 The \l Script element is a QML language \e intrinsic.  It can be used anywhere in a
 QML file, \e except as the root element of a file or sub-component, but cannot be 
-assigned to an object property or given an id.  The included ECMAScript is evaluated 
+assigned to an object property or given an id.  The included JavaScript is evaluated 
 in a scope chain.  The \l {QML Scope} documentation covers the specifics of scoping 
 in QML.  
 
-A restriction on the ECMAScript used in QML is that you cannot add new members to the
+A restriction on the JavaScript used in QML is that you cannot add new members to the
 global object. This happens transparently when you try to use a variable without
-declaring it, and so declaring local variables is required when using ECMA script in
+declaring it, and so declaring local variables is required when using Java script in
 QML.
 
 The global object in QML has a variety of helper functions added to it, to aid UI
@@ -68,7 +68,7 @@ you do not need the \l Script element. See \l {Extending types from QML#Adding n
 
 \section1 Inline Script
 
-Small blocks of ECMAScript can be included directly inside a \l {QML Document} as
+Small blocks of JavaScript can be included directly inside a \l {QML Document} as
 the body of the \l Script element.
 
 \code
@@ -129,7 +129,7 @@ until the script has been retrieved.
 
 \section1 Running Script at Startup
 
-It is occasionally necessary to run a block of ECMAScript code at application (or
+It is occasionally necessary to run a block of JavaScript code at application (or
 component instance) "startup".  While it is tempting to just include the startup
 script as \e {global code} in an external script file, this can have severe limitations
 as the QML environment may not have been fully established.  For example, some objects 
@@ -160,7 +160,7 @@ execute at startup, they are run sequentially in an undefined order.
 
 \section1 QML Script Restrictions
 
-QML \l Script blocks contain standard ECMAScript code.  QML introduces the following
+QML \l Script blocks contain standard JavaScript code.  QML introduces the following
 restrictions.
 
 \list
@@ -169,8 +169,8 @@ restrictions.
 In QML, the global object is constant - existing properties cannot be modified or 
 deleted, and no new properties may be created.
 
-Most ECMAScript programs do not explicitly modify the global object.  However, 
-ECMAScript's automatic creation of undeclared variables is an implicit modification
+Most JavaScript programs do not explicitly modify the global object.  However, 
+JavaScript's automatic creation of undeclared variables is an implicit modification
 of the global object, and is prohibited in QML.
 
 Assuming that the \c a variable does not exist in the scope chain, the following code 
diff --git a/doc/src/declarative/propertybinding.qdoc b/doc/src/declarative/propertybinding.qdoc
index 8d0ffa9..ad4f13e 100644
--- a/doc/src/declarative/propertybinding.qdoc
+++ b/doc/src/declarative/propertybinding.qdoc
@@ -44,11 +44,11 @@
 \title Property Binding
 
 Property binding is a declarative way of specifying the value of a property.  Binding allows
-a property's value to be expressed as an ECMAScript expression that defines the value relative
+a property's value to be expressed as an JavaScript expression that defines the value relative
 to other property values or data accessible in the application.  The property value is 
 automatically kept up to date if the other properties or data values change.
 
-Property bindings are created implicitly in QML whenever a property is assigned an ECMAScript
+Property bindings are created implicitly in QML whenever a property is assigned an JavaScript
 expression.  The following QML uses two property bindings to connect the size of the rectangle
 to that of \c otherItem.
 
@@ -59,10 +59,10 @@ Rectangle {
 }
 \endcode
 
-QML extends a standards compliant ECMAScript engine, so any valid ECMAScript expression can be 
+QML extends a standards compliant JavaScript engine, so any valid JavaScript expression can be 
 used as a property binding.  Bindings can access object properties, make function calls and even
-use builtin ECMAScript objects like \e {Date} and \e {Math}.  Assigning a constant value to a 
-property can even be thought of as a binding - afterall, a constant is a valid ECMAScript 
+use builtin JavaScript objects like \e {Date} and \e {Math}.  Assigning a constant value to a 
+property can even be thought of as a binding - afterall, a constant is a valid JavaScript 
 expression!  Here are some examples of more complex bindings:
 
 \code
@@ -80,7 +80,7 @@ Rectangle {
 }
 \endcode
 
-Being ECMAScript expressions, bindings are evaluated in a scope chain.  The \l {QML Scope} 
+Being JavaScript expressions, bindings are evaluated in a scope chain.  The \l {QML Scope} 
 documentation covers the specifics of scoping in QML.
 
 \list
diff --git a/doc/src/declarative/qmldocument.qdoc b/doc/src/declarative/qmldocument.qdoc
index 453c023..deb6e1c 100644
--- a/doc/src/declarative/qmldocument.qdoc
+++ b/doc/src/declarative/qmldocument.qdoc
@@ -83,7 +83,7 @@ modifies the document prior to presentation to the QML runtime. \c import statem
 do not "include" code in the document, but instead instruct the QML runtime on how to 
 resolve type references found in the document.  Any type reference present in a QML 
 document - such as \c Rectangle and \c ListView - including those made within an 
-\l {ECMAScript Block} or \l {Property Binding}s, are \e resolved based exclusively on the 
+\l {JavaScript Block} or \l {Property Binding}s, are \e resolved based exclusively on the 
 import statements.  QML does not import any modules by default, so at least one \c import
 statement must be present or no elements will be available!
 
diff --git a/doc/src/declarative/qmlintro.qdoc b/doc/src/declarative/qmlintro.qdoc
index 8141c90..3891515 100644
--- a/doc/src/declarative/qmlintro.qdoc
+++ b/doc/src/declarative/qmlintro.qdoc
@@ -192,22 +192,29 @@ Item {
 
 \section3 The \c id property
 
-The \c id property is a special property of type \e id. Assigning an id to an object allows you
-to refer to it elsewhere.
+Each object can be given a special unique property called an \e id. Assigning an id enables the object
+to be referred to by other objects and scripts.
+
+The first Rectangle element below has an \e id, "myRect". The second Rectange element defines its
+own width by referring to \tt myRect.width, which means it will have the same \tt width
+value as the first Rectangle element.
 
 \code
 Item {
-    Text {
-        id: myName
-        text: "..."
+    Rectangle {
+        id: myRect
+        width: 100
+        height: 100
     }
-    Text {
-        text: myName.text
+    Rectangle {
+        width: myRect.width
+        height: 200
     }
 }
 \endcode
 
-\c Ids must begin with a lowercase letter.
+Note that an \e id must begin with a lower-case letter or an underscore, and cannot contain characters other than letters, numbers and underscores.
+
 
 \section2 List properties
 
diff --git a/doc/src/declarative/qmlmodels.qdoc b/doc/src/declarative/qmlmodels.qdoc
index 322f225..4115e8d 100644
--- a/doc/src/declarative/qmlmodels.qdoc
+++ b/doc/src/declarative/qmlmodels.qdoc
@@ -169,11 +169,58 @@ will be positioned by the view.
 
 \section1 C++ Data Models
 
-\list
-\o QAbstractItemModel provides the roles set via the QAbstractItemModel::setRoleNames() method.
-\o QStringList provides the contents of the list via the \e modelData role.
-\o QList<QObject*> provides the properties of the objects in the list as roles.
-\endlist
+\section2 QAbstractItemModel
+
+QAbstractItemModel provides the roles set via the QAbstractItemModel::setRoleNames() method.
+
+
+\section2 QStringList
+
+QStringList provides the contents of the list via the \e modelData role.
+
+
+\section2 QList<QObject*>
+
+QList<QObject*> provides the properties of the objects in the list as roles.
+
+\code
+class DataObject : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(QString color READ color WRITE setColor)
+...
+};
+
+QList<QObject*> dataList;
+dataList.append(new DataObject("Item 1", "red"));
+dataList.append(new DataObject("Item 2", "green"));
+dataList.append(new DataObject("Item 3", "blue"));
+dataList.append(new DataObject("Item 4", "yellow"));
+
+QmlContext *ctxt = view.rootContext();
+ctxt->setContextProperty("myModel", QVariant::fromValue(&dataList));
+\endcode
+
+The properties of the object may then be accessed in the delegate:
+
+\code
+ListView {
+   width: 100
+   height: 100
+   anchors.fill: parent
+   model: myModel
+   delegate: Component {
+       Rectangle {
+            height: 25
+            width: 100
+            color: model.color
+            Text { text: name }
+       }
+   }
+}
+\endcode
 
 
 \section1 Other Data Models
diff --git a/doc/src/declarative/qmlreference.qdoc b/doc/src/declarative/qmlreference.qdoc
index 614bc18..a413c22 100644
--- a/doc/src/declarative/qmlreference.qdoc
+++ b/doc/src/declarative/qmlreference.qdoc
@@ -74,7 +74,7 @@
     \list
     \o \l {QML Documents}
     \o \l {Property Binding}
-    \o \l {ECMAScript Blocks}
+    \o \l {JavaScript Blocks}
     \o \l {QML Scope}
     \o \l {Network Transparency}
     \o \l {qmlmodels}{Data Models}
diff --git a/doc/src/declarative/qtbinding.qdoc b/doc/src/declarative/qtbinding.qdoc
index 68723bf..2909f2e 100644
--- a/doc/src/declarative/qtbinding.qdoc
+++ b/doc/src/declarative/qtbinding.qdoc
@@ -91,7 +91,7 @@ the root context is available to all object instances.
 
 To expose data to a QML component instance, applications set \l {QmlContext::setContextProperty()}
 {context properties} which are then accessible by name from QML  \l {Property Binding}s and 
-\l {ECMAScript Blocks}.  The following example shows how to expose a background color to a QML
+\l {JavaScript Blocks}.  The following example shows how to expose a background color to a QML
 file.
 
 \table
diff --git a/doc/src/declarative/scope.qdoc b/doc/src/declarative/scope.qdoc
index ef30f94..defb217 100644
--- a/doc/src/declarative/scope.qdoc
+++ b/doc/src/declarative/scope.qdoc
@@ -45,16 +45,16 @@
 
 \tableofcontents
 
-\l {Property Binding}s and \l {ECMAScript Blocks} are executed in a scope chain automatically 
+\l {Property Binding}s and \l {JavaScript Blocks} are executed in a scope chain automatically 
 established by QML when a component instance is constructed.  QML is a \e {dynamically scoped} 
 language.  Different object instances instantiated from the same component can exist in 
 different scope chains.
 
 \image qml-scope.png
 
-\section1 ECMAScript Variable object
+\section1 JavaScript Variable object
 
-Each binding and script block has its own distinct ECMAScript variable object where local 
+Each binding and script block has its own distinct JavaScript variable object where local 
 variables are stored.  That is, local variables from different bindings and script blocks never 
 conflict.
 
@@ -375,6 +375,6 @@ Rectangle {
 
 \section1 QML Global Object
 
-The \l {QML Global Object} contains all the properties of the ECMAScript global object, plus some
+The \l {QML Global Object} contains all the properties of the JavaScript global object, plus some
 QML specific extensions.
 */
diff --git a/doc/src/examples/svgalib.qdoc b/doc/src/examples/svgalib.qdoc
index 9142112..cf6512c 100644
--- a/doc/src/examples/svgalib.qdoc
+++ b/doc/src/examples/svgalib.qdoc
@@ -43,6 +43,9 @@
     \example qws/svgalib
     \title Accelerated Graphics Driver Example
 
+    \warning This example was designed to work with Qt 4.4 and will not work
+    with current versions of Qt. It will be removed from Qt 4.7.
+
     The Accelerated Graphics Driver example shows how you can write
     your own accelerated graphics driver and \l {add your graphics
     driver to Qt for Embedded Linux}.  In \l{Qt for Embedded Linux},
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 6b4ec61..0c18773 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -406,7 +406,7 @@
     \clearfloat
     \section1 \l{D-Bus Examples}{D-Bus}
     \beginfloatleft
-    \l{D-Bus Examples}{\inlineimage qt-embedded-examples.png
+    \l{D-Bus Examples}{\inlineimage dbus-examples.png
     }
 
     \endfloat
@@ -416,7 +416,7 @@
     \clearfloat
     \section1 \l{Qt for Embedded Linux Examples}{Qt for Embedded Linux}
     \beginfloatleft
-    \l{Qt for Embedded Linux Examples}{\inlineimage dbus-examples.png
+    \l{Qt for Embedded Linux Examples}{\inlineimage qt-embedded-examples.png
     }
 
     \endfloat
diff --git a/doc/src/platforms/emb-install.qdoc b/doc/src/platforms/emb-install.qdoc
index c13fbef..623ba89 100644
--- a/doc/src/platforms/emb-install.qdoc
+++ b/doc/src/platforms/emb-install.qdoc
@@ -84,7 +84,9 @@
     Before building the \l{Qt for Embedded Linux} library, run the \c
     ./configure script to configure the library for your development
     architecture. You can list all of the configuration system's
-    options by typing \c {./configure -help}.
+    options by typing
+
+    \snippet doc/src/snippets/code/doc_src_emb-install.qdoc embedded help
 
     Note that by default, \l{Qt for Embedded Linux} is configured for
     installation in the \c{/usr/local/Trolltech/QtEmbedded-%VERSION%}
diff --git a/doc/src/snippets/code/doc_src_emb-install.qdoc b/doc/src/snippets/code/doc_src_emb-install.qdoc
index 60775d2..f24f087 100644
--- a/doc/src/snippets/code/doc_src_emb-install.qdoc
+++ b/doc/src/snippets/code/doc_src_emb-install.qdoc
@@ -41,18 +41,22 @@
 
 //! [0]
 cd <anywhere>
-gunzip qt-embedded-linux-commercial-src-%VERSION%.tar.gz
-tar xf qt-embedded-linux-commercial-src-%VERSION%.tar
+gunzip qt-everywhere-opensource-src-%VERSION%.tar.gz
+tar xf qt-everywhere-opensource-src-%VERSION%.tar
 //! [0]
 
 
 //! [1]
-~/qt-embedded-linux-commercial-src-%VERSION%
+~/qt-everywhere-opensource-src-%VERSION%
 //! [1]
 
 
+//! [embedded help]
+./configure -embedded -help
+//! [embedded help]
+
 //! [2]
-cd  ~/qt-embedded-linux-commercial-src-%VERSION%
+cd  ~/qt-everywhere-opensource-src-%VERSION%
 ./configure -embedded [architecture]
 //! [2]
 
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
index 483c675..4f27661 100644
--- a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
+++ b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
@@ -260,3 +260,14 @@ class CustomItem : public QGraphicsItem
    ...
 };
 //! [QGraphicsItem type]
+
+//! [18]
+class QGraphicsPathItem : public QAbstractGraphicsShapeItem
+{
+ public:
+  enum { Type = 2 };
+    int type() const { return Type; }
+  ...
+};
+//! [18]
+
diff --git a/doc/src/snippets/declarative/listview/dummydata/ContactModel.qml b/doc/src/snippets/declarative/listview/dummydata/ContactModel.qml
index 31e02ea..6832308 100644
--- a/doc/src/snippets/declarative/listview/dummydata/ContactModel.qml
+++ b/doc/src/snippets/declarative/listview/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/pathview/dummydata/MenuModel.qml b/doc/src/snippets/declarative/pathview/dummydata/MenuModel.qml
index 20b3b7d..1334cf4 100644
--- a/doc/src/snippets/declarative/pathview/dummydata/MenuModel.qml
+++ b/doc/src/snippets/declarative/pathview/dummydata/MenuModel.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 ListModel {
-    id: MenuModel
+    id: menuModel
     ListElement {
         name: "Bill Jones"
         icon: "pics/qtlogo-64.png"
diff --git a/doc/src/windows-and-dialogs/mainwindow.qdoc b/doc/src/windows-and-dialogs/mainwindow.qdoc
index ea8411f..6adfa75 100644
--- a/doc/src/windows-and-dialogs/mainwindow.qdoc
+++ b/doc/src/windows-and-dialogs/mainwindow.qdoc
@@ -51,7 +51,7 @@
 
     \nextpage The Application Main Window
 
-    A \l{Widgets}{widget} that is not embedded in a parent widget is called a window.
+    A \l{Widgets Tutorial}{widget} that is not embedded in a parent widget is called a window.
     Usually, windows have a frame and a title bar, although it is also possible to create
     windows without such decoration using suitable window flags). In Qt, QMainWindow
     and the various subclasses of QDialog are the most common window types.