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

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml:
  Replace QmlList* and QList* support with a single QmlListProperty type
  Rename MouseRegion -> MouseArea
  Update QmlChanges with animation API changes.
  Document the default velocity of EaseFollow
  Remove use of unexprted private classes.
  Fix compile error on Solaris
  Increase durations when testing Behaviors.
  Add cached path rounded rect painting benchmark.
  Remove use of direct event posting.  Use QTest::keyClick() for keys.

18 files changed, 23 insertions, 23 deletions

diff --git a/demos/declarative/calculator/CalcButton.qml b/demos/declarative/calculator/CalcButton.qml
index 08851d006b..6210e46088 100644
--- a/demos/declarative/calculator/CalcButton.qml
+++ b/demos/declarative/calculator/CalcButton.qml
@@ -15,7 +15,7 @@ Rectangle {
 
     Text { id: label; anchors.centerIn: parent; color: palette.buttonText }
 
-    MouseRegion {
+    MouseArea {
         id: clickRegion
         anchors.fill: parent
         onClicked: {
diff --git a/demos/declarative/flickr/common/MediaButton.qml b/demos/declarative/flickr/common/MediaButton.qml
index c12b6424ea..86ac948369 100644
--- a/demos/declarative/flickr/common/MediaButton.qml
+++ b/demos/declarative/flickr/common/MediaButton.qml
@@ -16,7 +16,7 @@ Item {
         source: "pics/button-pressed.png"
         opacity: 0
     }
-    MouseRegion {
+    MouseArea {
         id: mouseRegion
         anchors.fill: buttonImage
         onClicked: { container.clicked(); }
diff --git a/demos/declarative/flickr/common/MediaLineEdit.qml b/demos/declarative/flickr/common/MediaLineEdit.qml
index b24b296737..3dfd1f3a5d 100644
--- a/demos/declarative/flickr/common/MediaLineEdit.qml
+++ b/demos/declarative/flickr/common/MediaLineEdit.qml
@@ -62,7 +62,7 @@ Item {
         anchors.right: container.right
     }
 
-    MouseRegion {
+    MouseArea {
         id: mouseRegion
         anchors.fill: buttonImage
         onClicked: { container.state = container.state=="Edit" ? "" : "Edit" }
diff --git a/demos/declarative/flickr/common/Slider.qml b/demos/declarative/flickr/common/Slider.qml
index fa1645c136..05a87e7102 100644
--- a/demos/declarative/flickr/common/Slider.qml
+++ b/demos/declarative/flickr/common/Slider.qml
@@ -27,7 +27,7 @@ Item {
             GradientStop { position: 1.0; color: "gray" }
         }
 
-        MouseRegion {
+        MouseArea {
             anchors.fill: parent; drag.target: parent
             drag.axis: "XAxis"; drag.minimumX: 2; drag.maximumX: slider.xMax+2
             onPositionChanged: { value = (maximum - minimum) * (handle.x-2) / slider.xMax + minimum; }
diff --git a/demos/declarative/flickr/common/Star.qml b/demos/declarative/flickr/common/Star.qml
index 173021b64e..8cd47b461a 100644
--- a/demos/declarative/flickr/common/Star.qml
+++ b/demos/declarative/flickr/common/Star.qml
@@ -17,7 +17,7 @@ Item {
         opacity: 0.4
         scale: 0.5
     }
-    MouseRegion {
+    MouseArea {
         anchors.fill: container
         onClicked: { container.clicked() }
     }
diff --git a/demos/declarative/flickr/flickr-desktop.qml b/demos/declarative/flickr/flickr-desktop.qml
index 3848f12754..1ca3cdc8d5 100644
--- a/demos/declarative/flickr/flickr-desktop.qml
+++ b/demos/declarative/flickr/flickr-desktop.qml
@@ -61,7 +61,7 @@ Item {
                 }
             }
 
-            MouseRegion { anchors.fill: wrapper; onClicked: { photoClicked() } }
+            MouseArea { anchors.fill: wrapper; onClicked: { photoClicked() } }
 
             states: [
                 State {
diff --git a/demos/declarative/flickr/mobile/Button.qml b/demos/declarative/flickr/mobile/Button.qml
index 770330cd47..4ba6b19be2 100644
--- a/demos/declarative/flickr/mobile/Button.qml
+++ b/demos/declarative/flickr/mobile/Button.qml
@@ -18,7 +18,7 @@ Item {
         source: "images/toolbutton.sci"
         width: container.width; height: container.height
     }
-    MouseRegion {
+    MouseArea {
         id: mouseRegion
         anchors.fill: buttonImage
         onClicked: { container.clicked(); }
diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml
index 6c1289654f..0f5b69c306 100644
--- a/demos/declarative/flickr/mobile/GridDelegate.qml
+++ b/demos/declarative/flickr/mobile/GridDelegate.qml
@@ -67,6 +67,6 @@
                  }
              ]
          }
-         MouseRegion { anchors.fill: wrapper; onClicked: { photoClicked() } }
+         MouseArea { anchors.fill: wrapper; onClicked: { photoClicked() } }
      }
  }
diff --git a/demos/declarative/minehunt/Description.qml b/demos/declarative/minehunt/Description.qml
index 440dd2eb56..cc4d3b202a 100644
--- a/demos/declarative/minehunt/Description.qml
+++ b/demos/declarative/minehunt/Description.qml
@@ -4,7 +4,7 @@ Item {
     id: page
     height: myText.height + 20
     property var text
-    MouseRegion {
+    MouseArea {
         anchors.fill: parent
         drag.target: page
         drag.axis: "XandYAxis"
diff --git a/demos/declarative/minehunt/minehunt.qml b/demos/declarative/minehunt/minehunt.qml
index 18e819592c..92555c2048 100644
--- a/demos/declarative/minehunt/minehunt.qml
+++ b/demos/declarative/minehunt/minehunt.qml
@@ -101,7 +101,7 @@ Item {
                         }
                     }
                 ]
-                MouseRegion {
+                MouseArea {
                     anchors.fill: parent
                     acceptedButtons: Qt.LeftButton | Qt.RightButton
                     onPressed: {
@@ -188,7 +188,7 @@ Item {
         anchors.right: field.right
         anchors.rightMargin: 20
         source: isPlaying ? 'pics/face-smile.png' : hasWon ? 'pics/face-smile-big.png': 'pics/face-sad.png'
-        MouseRegion {
+        MouseArea {
             anchors.fill: parent
             onPressed: { reset() }
         }
diff --git a/demos/declarative/samegame/content/Button.qml b/demos/declarative/samegame/content/Button.qml
index 63cd5556d6..6629302051 100644
--- a/demos/declarative/samegame/content/Button.qml
+++ b/demos/declarative/samegame/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/demos/declarative/samegame/content/Dialog.qml b/demos/declarative/samegame/content/Dialog.qml
index 5bd11239cc..7769328b07 100644
--- a/demos/declarative/samegame/content/Dialog.qml
+++ b/demos/declarative/samegame/content/Dialog.qml
@@ -18,5 +18,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/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml
index f5c4fc53c2..50f629371b 100644
--- a/demos/declarative/samegame/samegame.qml
+++ b/demos/declarative/samegame/samegame.qml
@@ -28,7 +28,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);
             }
diff --git a/demos/declarative/snake/content/Button.qml b/demos/declarative/snake/content/Button.qml
index 63cd5556d6..6629302051 100644
--- a/demos/declarative/snake/content/Button.qml
+++ b/demos/declarative/snake/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/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml
index 58827a75a9..3bec7477ff 100644
--- a/demos/declarative/snake/snake.qml
+++ b/demos/declarative/snake/snake.qml
@@ -101,7 +101,7 @@ Rectangle {
                 id: skull
             }
 
-            MouseRegion {
+            MouseArea {
                 anchors.fill: parent
                 onPressed: {
                     if (!head || !heartbeat.running) {
diff --git a/demos/declarative/twitter/content/Button.qml b/demos/declarative/twitter/content/Button.qml
index 09d471c4f2..4cba8c3219 100644
--- a/demos/declarative/twitter/content/Button.qml
+++ b/demos/declarative/twitter/content/Button.qml
@@ -19,7 +19,7 @@ Item {
         source: "images/toolbutton.sci"
         width: container.width; height: container.height
     }
-    MouseRegion {
+    MouseArea {
         id: mouseRegion
         anchors.fill: buttonImage
         onClicked: { container.clicked(); }
diff --git a/demos/declarative/webbrowser/content/fieldtext/FieldText.qml b/demos/declarative/webbrowser/content/fieldtext/FieldText.qml
index b1c1938881..19b6acc322 100644
--- a/demos/declarative/webbrowser/content/fieldtext/FieldText.qml
+++ b/demos/declarative/webbrowser/content/fieldtext/FieldText.qml
@@ -93,17 +93,17 @@ Item {
         }
     }
 
-    MouseRegion {
+    MouseArea {
         anchors.fill: cancelIcon
         onClicked: { reset() }
     }
 
-    MouseRegion {
+    MouseArea {
         anchors.fill: confirmIcon
         onClicked: { confirm() }
     }
 
-    MouseRegion {
+    MouseArea {
         id: editRegion
         anchors.fill: textEdit
         onClicked: { edit() }
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index 8de13d558b..934593c7be 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -103,7 +103,7 @@ Item {
                         }
                     }
                 ]
-                MouseRegion {
+                MouseArea {
                     anchors.fill: back_e
                     onClicked: { if (webView.back.enabled) webView.back.trigger() }
                 }
@@ -114,7 +114,7 @@ Item {
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.verticalCenter: parent.verticalCenter
             }
-            MouseRegion {
+            MouseArea {
                 anchors.fill: reload
                 onClicked: { webView.reload.trigger() }
             }
@@ -159,7 +159,7 @@ Item {
                         }
                     }
                 ]
-                MouseRegion {
+                MouseArea {
                     anchors.fill: parent
                     onClicked: { if (webView.forward.enabled) webView.forward.trigger() }
                 }