Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2

10 files changed, 10 insertions, 10 deletions

diff --git a/examples/declarative/tutorials/helloworld/Cell.qml b/examples/declarative/tutorials/helloworld/Cell.qml
index c38b40e..de4f3bb 100644
--- a/examples/declarative/tutorials/helloworld/Cell.qml
+++ b/examples/declarative/tutorials/helloworld/Cell.qml
@@ -23,7 +23,7 @@ Item {
 //![2]
 
 //![3]
-    MouseRegion {
+    MouseArea {
         anchors.fill: parent
         onClicked: container.clicked(container.color)
     }
diff --git a/examples/declarative/tutorials/helloworld/tutorial3.qml b/examples/declarative/tutorials/helloworld/tutorial3.qml
index 107b066..9eaa009 100644
--- a/examples/declarative/tutorials/helloworld/tutorial3.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial3.qml
@@ -14,7 +14,7 @@ Rectangle {
         transformOrigin: Item.Center
 
 //![1]
-        MouseRegion { id: mouseRegion; anchors.fill: parent }
+        MouseArea { id: mouseRegion; anchors.fill: parent }
 //![1]
 
 //![2]
diff --git a/examples/declarative/tutorials/samegame/samegame1/Button.qml b/examples/declarative/tutorials/samegame/samegame1/Button.qml
index 85e6777..2e31ff8 100644
--- a/examples/declarative/tutorials/samegame/samegame1/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/Button.qml
@@ -18,7 +18,7 @@ Rectangle {
         GradientStop { position: 1.0; color: activePalette.button }
     }
 
-    MouseRegion { id: mr; anchors.fill: parent; onClicked: container.clicked() }
+    MouseArea { id: mr; anchors.fill: parent; onClicked: container.clicked() }
 
     Text {
         id: txtItem; text: container.text; anchors.centerIn: container; color: activePalette.buttonText
diff --git a/examples/declarative/tutorials/samegame/samegame2/Button.qml b/examples/declarative/tutorials/samegame/samegame2/Button.qml
index 63cd555..6629302 100644
--- a/examples/declarative/tutorials/samegame/samegame2/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/Button.qml
@@ -17,7 +17,7 @@ Rectangle {
         GradientStop { position: 1.0; color: activePalette.button }
     }
 
-    MouseRegion { id: mr; anchors.fill: parent; onClicked: container.clicked() }
+    MouseArea { id: mr; anchors.fill: parent; onClicked: container.clicked() }
 
     Text {
         id: txtItem; text: container.text; anchors.centerIn: container; color: activePalette.buttonText
diff --git a/examples/declarative/tutorials/samegame/samegame3/Button.qml b/examples/declarative/tutorials/samegame/samegame3/Button.qml
index 63cd555..6629302 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/Button.qml
@@ -17,7 +17,7 @@ Rectangle {
         GradientStop { position: 1.0; color: activePalette.button }
     }
 
-    MouseRegion { id: mr; anchors.fill: parent; onClicked: container.clicked() }
+    MouseArea { id: mr; anchors.fill: parent; onClicked: container.clicked() }
 
     Text {
         id: txtItem; text: container.text; anchors.centerIn: container; color: activePalette.buttonText
diff --git a/examples/declarative/tutorials/samegame/samegame3/Dialog.qml b/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
index 96dc246..9d35832 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
@@ -18,6 +18,6 @@ Rectangle {
         NumberAnimation { duration: 1000 }
     }
     Text { id: myText; anchors.centerIn: parent; text: "Hello World!" }
-    MouseRegion { id: mr; anchors.fill: parent; onClicked: forceClose(); }
+    MouseArea { id: mr; anchors.fill: parent; onClicked: forceClose(); }
 }
 //![0]
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.qml b/examples/declarative/tutorials/samegame/samegame3/samegame.qml
index 8bdb428..c616397 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/samegame.qml
@@ -27,7 +27,7 @@ Rectangle {
             width: parent.width - (parent.width % tileSize);
             height: parent.height - (parent.height % tileSize);
 
-            MouseRegion {
+            MouseArea {
                 id: gameMR
                 anchors.fill: parent; onClicked: handleClick(mouse.x,mouse.y);
             }
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/Button.qml b/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
index 63cd555..6629302 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
@@ -17,7 +17,7 @@ Rectangle {
         GradientStop { position: 1.0; color: activePalette.button }
     }
 
-    MouseRegion { id: mr; anchors.fill: parent; onClicked: container.clicked() }
+    MouseArea { id: mr; anchors.fill: parent; onClicked: container.clicked() }
 
     Text {
         id: txtItem; text: container.text; anchors.centerIn: container; color: activePalette.buttonText
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml b/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
index 3371d53..ed9fd32 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
@@ -17,5 +17,5 @@ Rectangle {
         NumberAnimation { duration: 1000 }
     }
     Text { id: myText; anchors.centerIn: parent; text: "Hello World!" }
-    MouseRegion { id: mr; anchors.fill: parent; onClicked: forceClose(); }
+    MouseArea { id: mr; anchors.fill: parent; onClicked: forceClose(); }
 }
diff --git a/examples/declarative/tutorials/samegame/samegame4/samegame.qml b/examples/declarative/tutorials/samegame/samegame4/samegame.qml
index 19b929f..a228e60 100644
--- a/examples/declarative/tutorials/samegame/samegame4/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/samegame.qml
@@ -27,7 +27,7 @@ Rectangle {
             width: parent.width - (parent.width % getTileSize());
             height: parent.height - (parent.height % getTileSize());
 
-            MouseRegion {
+            MouseArea {
                 id: gameMR
                 anchors.fill: parent; onClicked: handleClick(mouse.x,mouse.y);
             }