Merge remote branch 'origin/master' into qtruntime

Conflicts:
	src/declarative/qml/qml.pri
	src/declarative/qml/qmlengine.cpp
	src/declarative/util/qmlview.h

4 files changed, 5 insertions, 5 deletions

diff --git a/doc/src/snippets/audio/main.cpp b/doc/src/snippets/audio/main.cpp
index 019f208..e21bf75 100644
--- a/doc/src/snippets/audio/main.cpp
+++ b/doc/src/snippets/audio/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the test suite of the Qt Toolkit.
+** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp b/doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp
index a18971d..1b1abea 100644
--- a/doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp
+++ b/doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the test suite of the Qt Toolkit.
+** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/doc/src/snippets/declarative/drag.qml b/doc/src/snippets/declarative/drag.qml
index 8735d0c..8e5b599 100644
--- a/doc/src/snippets/declarative/drag.qml
+++ b/doc/src/snippets/declarative/drag.qml
@@ -6,7 +6,7 @@ Rectangle {
     Image {
         id: pic; source: "qtlogo-64.png"; anchors.verticalCenter: parent.verticalCenter
         opacity: (600.0-pic.x) / 600;
-        MouseRegion {
+        MouseArea {
             anchors.fill: parent
             drag.target: pic
             drag.axis: "XAxis"
diff --git a/doc/src/snippets/declarative/mouseregion.qml b/doc/src/snippets/declarative/mouseregion.qml
index 67857f5..79f8f8f 100644
--- a/doc/src/snippets/declarative/mouseregion.qml
+++ b/doc/src/snippets/declarative/mouseregion.qml
@@ -4,13 +4,13 @@ Rectangle { width: 200; height: 100
 HorizontalLayout {
 //! [0]
 Rectangle { width: 100; height: 100; color: "green"
-    MouseRegion { anchors.fill: parent; onClicked: { parent.color = 'red' } }
+    MouseArea { anchors.fill: parent; onClicked: { parent.color = 'red' } }
 }
 //! [0]
 //! [1]
 Rectangle {
     width: 100; height: 100; color: "green"
-    MouseRegion {
+    MouseArea {
         anchors.fill: parent
         acceptedButtons: Qt.LeftButton | Qt.RightButton
         onClicked: {