Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (64 commits)
  More renaming: MouseRegion -> MouseArea
  Save secondary scope inside the expression's scope object
  'on' syntax fixes
  QDeclarativeProperty::read() returns a QObjectStar when accessing a QObject property
  Move JS global scope to top of the QML scope chain
  Add documentation for the 'when' property of Binding.
  Auto test for QTBUG-8677
  QDeclarativeGuard should handle objects being deleted
  OS-friendlier, less noisy.
  fix crash, re-enable settings test
  Fix incorrect scope resolution for script in a script block.
  Disable until plugin objects problem resolved.
  silence debuggery
  add colorbrowser qml example
  Fix settings (was not exported type).
  Add import Qt.widgets 4.6 to layout.qml example
  make runnable from elsewhere
  remove debugger
  runnable from elsewhere
  Ensure error is received - the root object is INITIALLY zero.
  ...

2 files changed, 5 insertions, 3 deletions

diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 1fd4dad..6cca39b 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -91,6 +91,7 @@ The following table lists the QML elements provided by the Qt Declarative module
 \o \l VisualDataModel
 \o \l Package
 \o \l XmlListModel and XmlRole
+\o \l WorkerListModel
 \o \l DateTimeFormatter
 \o \l NumberFormatter
 \endlist
@@ -102,6 +103,7 @@ The following table lists the QML elements provided by the Qt Declarative module
 \o \l Component
 \o \l Timer
 \o \l QtObject
+\o \l WorkerScript
 \endlist
 \endtable
 
diff --git a/doc/src/declarative/tutorial.qdoc b/doc/src/declarative/tutorial.qdoc
index 98efe12..310b776 100644
--- a/doc/src/declarative/tutorial.qdoc
+++ b/doc/src/declarative/tutorial.qdoc
@@ -173,10 +173,10 @@ In this case the rectangle will have the same size as its parent (see \l{anchor-
 
 \snippet examples/declarative/tutorials/helloworld/Cell.qml 3
 
-In order to change the color of the text when clicking on a cell, we create a \l MouseRegion element with
+In order to change the color of the text when clicking on a cell, we create a \l MouseArea element with
 the same size as its parent.
 
-A \l MouseRegion defines a signal called \e clicked.
+A \l MouseArea defines a signal called \e clicked.
 When this signal is triggered we want to emit our own \e clicked signal with the color as parameter.
 
 \section2 The main QML file
@@ -214,7 +214,7 @@ Here is the QML code:
 \snippet examples/declarative/tutorials/helloworld/tutorial3.qml 2
 
 First, we create a new \e down state for our text element.
-This state will be activated when the \l MouseRegion is pressed, and deactivated when it is released.
+This state will be activated when the \l MouseArea is pressed, and deactivated when it is released.
 
 The \e down state includes a set of property changes from our implicit \e {default state}
 (the items as they were initially defined in the QML).