Merge remote branch 'main/4.7' into 4.7

Conflicts:
	demos/declarative/minehunt/minehunt.cpp
	src/declarative/qml/qdeclarativecompiler.cpp

22 files changed, 85 insertions, 336 deletions

diff --git a/examples/declarative/animations/color-animation.qml b/examples/declarative/animations/color-animation.qml
index 025134b..d8361ba 100644
--- a/examples/declarative/animations/color-animation.qml
+++ b/examples/declarative/animations/color-animation.qml
@@ -12,7 +12,7 @@ Item {
             GradientStop {
                 position: 0.0
                 SequentialAnimation on color {
-                    repeat: true
+                    loops: Animation.Infinite
                     ColorAnimation { from: "DeepSkyBlue"; to: "#0E1533"; duration: 5000 }
                     ColorAnimation { from: "#0E1533"; to: "DeepSkyBlue"; duration: 5000 }
                 }
@@ -20,7 +20,7 @@ Item {
             GradientStop {
                 position: 1.0
                 SequentialAnimation on color {
-                    repeat: true
+                    loops: Animation.Infinite
                     ColorAnimation { from: "SkyBlue"; to: "#437284"; duration: 5000 }
                     ColorAnimation { from: "#437284"; to: "SkyBlue"; duration: 5000 }
                 }
@@ -32,7 +32,7 @@ Item {
     Item {
         width: parent.width; height: 2 * parent.height
         transformOrigin: Item.Center
-        NumberAnimation on rotation { from: 0; to: 360; duration: 10000; repeat: true }
+        NumberAnimation on rotation { from: 0; to: 360; duration: 10000; loops: Animation.Infinite }
         Image {
             source: "images/sun.png"; y: 10; anchors.horizontalCenter: parent.horizontalCenter
             transformOrigin: Item.Center; rotation: -3 * parent.rotation
@@ -46,7 +46,7 @@ Item {
             source: "images/star.png"; angleDeviation: 360; velocity: 0
             velocityDeviation: 0; count: parent.width / 10; fadeInDuration: 2800
             SequentialAnimation on opacity {
-                repeat: true
+                loops: Animation.Infinite
                 NumberAnimation { from: 0; to: 1; duration: 5000 }
                 NumberAnimation { from: 1; to: 0; duration: 5000 }
             }
@@ -60,7 +60,7 @@ Item {
             GradientStop {
                 position: 0.0
                 SequentialAnimation on color {
-                    repeat: true
+                    loops: Animation.Infinite
                     ColorAnimation { from: "ForestGreen"; to: "#001600"; duration: 5000 }
                     ColorAnimation { from: "#001600"; to: "ForestGreen"; duration: 5000 }
                 }
diff --git a/examples/declarative/animations/property-animation.qml b/examples/declarative/animations/property-animation.qml
index 4428f34..401feb5 100644
--- a/examples/declarative/animations/property-animation.qml
+++ b/examples/declarative/animations/property-animation.qml
@@ -43,7 +43,7 @@ Item {
         // Animate the y property. Setting repeat to true makes the
         // animation repeat indefinitely, otherwise it would only run once.
         SequentialAnimation on y {
-            repeat: true
+            loops: Animation.Infinite
 
             // Move from minHeight to maxHeight in 300ms, using the OutExpo easing function
             NumberAnimation {
diff --git a/examples/declarative/border-image/content/MyBorderImage.qml b/examples/declarative/border-image/content/MyBorderImage.qml
index 5621e18..f0c3cfc 100644
--- a/examples/declarative/border-image/content/MyBorderImage.qml
+++ b/examples/declarative/border-image/content/MyBorderImage.qml
@@ -18,13 +18,13 @@ Item {
         id: image; x: container.width / 2 - width / 2; y: container.height / 2 - height / 2
 
         SequentialAnimation on width {
-            repeat: true
+            loops: Animation.Infinite
             NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing.type: "InOutQuad"}
             NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing.type: "InOutQuad" }
         }
 
         SequentialAnimation on height {
-            repeat: true
+            loops: Animation.Infinite
             NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing.type: "InOutQuad"}
             NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing.type: "InOutQuad" }
         }
diff --git a/examples/declarative/dynamic/qml/PaletteItem.qml b/examples/declarative/dynamic/qml/PaletteItem.qml
index 8a9a9ee..08bdc40 100644
--- a/examples/declarative/dynamic/qml/PaletteItem.qml
+++ b/examples/declarative/dynamic/qml/PaletteItem.qml
@@ -1,13 +1,13 @@
 import Qt 4.6
+import "itemCreation.js" as Code
 
 GenericItem {
     id: itemButton
     property string file
-    Script { source: "itemCreation.js" }
     MouseArea { 
         anchors.fill: parent; 
-        onPressed: startDrag(mouse);
-        onPositionChanged: moveDrag(mouse);
-        onReleased: endDrag(mouse);
+        onPressed: Code.startDrag(mouse);
+        onPositionChanged: Code.moveDrag(mouse);
+        onReleased: Code.endDrag(mouse);
     }
 }
diff --git a/examples/declarative/effects/effects.qml b/examples/declarative/effects/effects.qml
index 997d7de..2280a2a 100644
--- a/examples/declarative/effects/effects.qml
+++ b/examples/declarative/effects/effects.qml
@@ -16,7 +16,7 @@ Rectangle {
                 running: false
                 from: 0; to: 10
                 duration: 1000
-                repeat: true
+                loops: Animation.Infinite
             }
         }
 
@@ -33,7 +33,7 @@ Rectangle {
         effect: DropShadow {
             blurRadius: 3
             offset.x: 3
-            NumberAnimation on offset.y { id: dropShadowEffect; from: 0; to: 10; duration: 1000; running: false; repeat: true; }
+            NumberAnimation on offset.y { id: dropShadowEffect; from: 0; to: 10; duration: 1000; running: false; loops: Animation.Infinite; }
         }
 
         MouseArea { anchors.fill: parent; onClicked: dropShadowEffect.running = !dropShadowEffect.running }
diff --git a/examples/declarative/fillmode/fillmode.qml b/examples/declarative/fillmode/fillmode.qml
index ab0f81c..3f2020c 100644
--- a/examples/declarative/fillmode/fillmode.qml
+++ b/examples/declarative/fillmode/fillmode.qml
@@ -5,7 +5,7 @@ Image {
     height: 250
     source: "face.png"
     SequentialAnimation on fillMode {
-        repeat: true
+        loops: Animation.Infinite
         PropertyAction { value: Image.Stretch }
         PropertyAction { target: label; property: "text"; value: "Stretch" }
         PauseAnimation { duration: 1000 }
diff --git a/examples/declarative/fonts/banner.qml b/examples/declarative/fonts/banner.qml
index 7989f80..957246f 100644
--- a/examples/declarative/fonts/banner.qml
+++ b/examples/declarative/fonts/banner.qml
@@ -10,7 +10,7 @@ Rectangle {
 
     Row {
         y: -screen.height / 4.5
-        NumberAnimation on x { from: 0; to: -text.width; duration: 6000; repeat: true }
+        NumberAnimation on x { from: 0; to: -text.width; duration: 6000; loops: Animation.Infinite }
         Text { id: text; font.pixelSize: screen.pixelSize; color: screen.textColor; text: screen.text }
         Text { font.pixelSize: screen.pixelSize; color: screen.textColor; text: screen.text }
         Text { font.pixelSize: screen.pixelSize; color: screen.textColor; text: screen.text }
diff --git a/examples/declarative/fonts/hello.qml b/examples/declarative/fonts/hello.qml
index 334409e..e15a0f0 100644
--- a/examples/declarative/fonts/hello.qml
+++ b/examples/declarative/fonts/hello.qml
@@ -10,7 +10,7 @@ Rectangle {
             text: "Hello world!"; font.pixelSize: 60
 
             SequentialAnimation on font.letterSpacing {
-                repeat: true;
+                loops: Animation.Infinite;
                 NumberAnimation { from: 100; to: 300; easing.type: "InQuad"; duration: 3000 }
                 ScriptAction { script: {
                     container.y = (screen.height / 4) + (Math.random() * screen.height / 2)
@@ -18,7 +18,7 @@ Rectangle {
                 } }
             }
             SequentialAnimation on opacity {
-                repeat: true;
+                loops: Animation.Infinite;
                 NumberAnimation { from: 1; to: 0; duration: 2600 }
                 PauseAnimation { duration: 400 }
             }
diff --git a/examples/declarative/listview/content/ClickAutoRepeating.qml b/examples/declarative/listview/content/ClickAutoRepeating.qml
index 5240e65..cbf1f3b 100644
--- a/examples/declarative/listview/content/ClickAutoRepeating.qml
+++ b/examples/declarative/listview/content/ClickAutoRepeating.qml
@@ -18,7 +18,7 @@ Item {
         ScriptAction { script: page.clicked() }
         PauseAnimation { duration: repeatdelay }
         SequentialAnimation {
-            repeat: true
+            loops: Animation.Infinite
             ScriptAction { script: page.clicked() }
             PauseAnimation { duration: repeatperiod }
         }
diff --git a/examples/declarative/parallax/qml/Smiley.qml b/examples/declarative/parallax/qml/Smiley.qml
index 4442d5e..c13b879 100644
--- a/examples/declarative/parallax/qml/Smiley.qml
+++ b/examples/declarative/parallax/qml/Smiley.qml
@@ -25,7 +25,7 @@ Item {
         // Animate the y property. Setting repeat to true makes the
         // animation repeat indefinitely, otherwise it would only run once.
         SequentialAnimation  on y {
-            repeat: true
+            loops: Animation.Infinite
 
             // Move from minHeight to maxHeight in 300ms, using the OutExpo easing function
             NumberAnimation {
diff --git a/examples/declarative/progressbar/progressbars.qml b/examples/declarative/progressbar/progressbars.qml
index a66d544..c8022b0 100644
--- a/examples/declarative/progressbar/progressbars.qml
+++ b/examples/declarative/progressbar/progressbars.qml
@@ -14,9 +14,9 @@ Rectangle {
                 ProgressBar {
                     property int r: Math.floor(Math.random() * 5000 + 1000)
                     width: main.width - 20
-                    NumberAnimation on value { duration: r; from: 0; to: 100; repeat: true }
-                    ColorAnimation on color { duration: r; from: "lightsteelblue"; to: "thistle"; repeat: true }
-                    ColorAnimation on secondColor { duration: r; from: "steelblue"; to: "#CD96CD"; repeat: true }
+                    NumberAnimation on value { duration: r; from: 0; to: 100; loops: Animation.Infinite }
+                    ColorAnimation on color { duration: r; from: "lightsteelblue"; to: "thistle"; loops: Animation.Infinite }
+                    ColorAnimation on secondColor { duration: r; from: "steelblue"; to: "#CD96CD"; loops: Animation.Infinite }
                 }
             }
         }
diff --git a/examples/declarative/sql/hello.qml b/examples/declarative/sql/hello.qml
index 277dfeb..29e084c 100644
--- a/examples/declarative/sql/hello.qml
+++ b/examples/declarative/sql/hello.qml
@@ -1,30 +1,29 @@
 import Qt 4.6
 
 Text {
-    Script {
-        function findGreetings() {
-            var db = openDatabaseSync("QDeclarativeExampleDB", "1.0", "The Example QML SQL!", 1000000);
+    function findGreetings() {
+        var db = openDatabaseSync("QDeclarativeExampleDB", "1.0", "The Example QML SQL!", 1000000);
 
-            db.transaction(
-                function(tx) {
-                    // Create the database if it doesn't already exist
-                    tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
+        db.transaction(
+            function(tx) {
+                // Create the database if it doesn't already exist
+                tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
 
-                    // Add (another) greeting row
-                    tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+                // Add (another) greeting row
+                tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
 
-                    // Show all added greetings
-                    var rs = tx.executeSql('SELECT * FROM Greeting');
+                // Show all added greetings
+                var rs = tx.executeSql('SELECT * FROM Greeting');
 
-                    var r = ""
-                    for(var i = 0; i < rs.rows.length; i++) {
-                        r += rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee + "\n"
-                    }
-                    text = r
+                var r = ""
+                for(var i = 0; i < rs.rows.length; i++) {
+                    r += rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee + "\n"
                 }
-            )
-        }
+                text = r
+            }
+        )
     }
+
     text: "?"
     Component.onCompleted: findGreetings()
 }
diff --git a/examples/declarative/tic-tac-toe/tic-tac-toe.qml b/examples/declarative/tic-tac-toe/tic-tac-toe.qml
index ae187d2..4bb1e3f 100644
--- a/examples/declarative/tic-tac-toe/tic-tac-toe.qml
+++ b/examples/declarative/tic-tac-toe/tic-tac-toe.qml
@@ -1,5 +1,6 @@
 import Qt 4.6
 import "content"
+import "tic-tac-toe.js" as Logic
 
 Item {
     id: game
@@ -29,164 +30,17 @@ Item {
                 height: board.height/3
                 onClicked: {
                     if (!endtimer.running) {
-                        if (!makeMove(index,"X"))
-                            computerTurn()
+                        if (!Logic.makeMove(index,"X"))
+                            Logic.computerTurn()
                     }
                 }
             }
         }
 
-        Script {
-            function winner(board)
-            {
-                for (var i=0; i<3; ++i) {
-                    if (board.children[i].state!=""
-                        && board.children[i].state==board.children[i+3].state
-                        && board.children[i].state==board.children[i+6].state)
-                        return true
-
-                    if (board.children[i*3].state!=""
-                        && board.children[i*3].state==board.children[i*3+1].state
-                        && board.children[i*3].state==board.children[i*3+2].state)
-                        return true
-                }
-
-                if (board.children[0].state!=""
-                    && board.children[0].state==board.children[4].state!=""
-                    && board.children[0].state==board.children[8].state!="")
-                    return true
-
-                if (board.children[2].state!=""
-                    && board.children[2].state==board.children[4].state!=""
-                    && board.children[2].state==board.children[6].state!="")
-                    return true
-
-                return false
-            }
-
-            function restart()
-            {
-                // No moves left - start again
-                for (var i=0; i<9; ++i)
-                    board.children[i].state = ""
-            }
-
-            function makeMove(pos,player)
-            {
-                board.children[pos].state = player
-                if (winner(board)) {
-                    win(player + " wins")
-                    return true
-                } else {
-                    return false
-                }
-            }
-
-            function computerTurn()
-            {
-                var r = Math.random();
-                if(r < game.difficulty){
-                    smartAI();
-                }else{
-                    randAI();
-                }
-            }
-
-            function smartAI()
-            {
-                function boardCopy(a){
-                    var ret = new Object;
-                    ret.children = new Array(9);
-                    for(var i = 0; i<9; i++){
-                        ret.children[i] = new Object;
-                        ret.children[i].state = a.children[i].state;
-                    }
-                    return ret;
-                }
-                for(var i=0; i<9; i++){
-                    var simpleBoard = boardCopy(board);
-                    if (board.children[i].state == "") {
-                        simpleBoard.children[i].state = "O";
-                        if(winner(simpleBoard)){
-                            makeMove(i,"O")
-                            return
-                        }
-                    }
-                }
-                for(var i=0; i<9; i++){
-                    var simpleBoard = boardCopy(board);
-                    if (board.children[i].state == "") {
-                        simpleBoard.children[i].state = "X";
-                        if(winner(simpleBoard)){
-                            makeMove(i,"O")
-                            return
-                        }
-                    }
-                }
-                function thwart(a,b,c){//If they are at a, try b or c
-                    if (board.children[a].state == "X") {
-                        if (board.children[b].state == "") {
-                            makeMove(b,"O")
-                            return true
-                        }else if (board.children[c].state == "") {
-                            makeMove(c,"O")
-                            return true
-                        }
-                    }
-                    return false;
-                }
-                if(thwart(4,0,2)) return;
-                if(thwart(0,4,3)) return;
-                if(thwart(2,4,1)) return;
-                if(thwart(6,4,7)) return;
-                if(thwart(8,4,5)) return;
-                if(thwart(1,4,2)) return;
-                if(thwart(3,4,0)) return;
-                if(thwart(5,4,8)) return;
-                if(thwart(7,4,6)) return;
-                for(var i =0; i<9; i++){//Backup
-                    if (board.children[i].state == "") {
-                        makeMove(i,"O")
-                        return
-                    }
-                }
-                restart();
-            }
-
-            function randAI()
-            {
-                var open = 0;
-                for (var i=0; i<9; ++i)
-                    if (board.children[i].state == "") {
-                        open += 1;
-                    }
-                if(open == 0){
-                    restart();
-                    return;
-                }
-                var openA = new Array(open);//JS doesn't have lists I can append to (i think)
-                var acc = 0;
-                for (var i=0; i<9; ++i)
-                    if (board.children[i].state == "") {
-                        openA[acc] = i;
-                        acc += 1;
-                    }
-                var choice = openA[Math.floor(Math.random() * open)];
-                makeMove(choice, "O");
-            }
-
-            function win(s)
-            {
-                msg.text = s
-                msg.opacity = 1
-                endtimer.running = true
-            }
-        }
-
         Timer {
             id: endtimer
             interval: 1600
-            onTriggered: { msg.opacity = 0; restart() }
+            onTriggered: { msg.opacity = 0; Logic.restart() }
         }
     }
 
diff --git a/examples/declarative/tvtennis/tvtennis.qml b/examples/declarative/tvtennis/tvtennis.qml
index 6022a15..fcb285d 100644
--- a/examples/declarative/tvtennis/tvtennis.qml
+++ b/examples/declarative/tvtennis/tvtennis.qml
@@ -21,7 +21,7 @@ Rectangle {
 
         // Move the ball to the right and back to the left repeatedly
         SequentialAnimation on x {
-            repeat: true
+            loops: Animation.Infinite
             NumberAnimation { to: page.width - 40; duration: 2000 }
             ScriptAction { script: paddle.play() }
             PropertyAction { target: ball; property: "direction"; value: "left" }
diff --git a/examples/declarative/webview/content/FieldText.qml b/examples/declarative/webview/content/FieldText.qml
index d282209..1da9219 100644
--- a/examples/declarative/webview/content/FieldText.qml
+++ b/examples/declarative/webview/content/FieldText.qml
@@ -10,30 +10,26 @@ Item {
     signal cancelled
     signal startEdit
 
-    Script {
-
-        function edit() {
-            if (!mouseGrabbed) {
-                fieldText.startEdit();
-                fieldText.state='editing';
-                mouseGrabbed=true;
-            }
-        }
-
-        function confirm() {
-            fieldText.state='';
-            fieldText.text = textEdit.text;
-            mouseGrabbed=false;
-            fieldText.confirmed();
+    function edit() {
+        if (!mouseGrabbed) {
+            fieldText.startEdit();
+            fieldText.state='editing';
+            mouseGrabbed=true;
         }
+    }
 
-        function reset() {
-            textEdit.text = fieldText.text;
-            fieldText.state='';
-            mouseGrabbed=false;
-            fieldText.cancelled();
-        }
+    function confirm() {
+        fieldText.state='';
+        fieldText.text = textEdit.text;
+        mouseGrabbed=false;
+        fieldText.confirmed();
+    }
 
+    function reset() {
+        textEdit.text = fieldText.text;
+        fieldText.state='';
+        mouseGrabbed=false;
+        fieldText.cancelled();
     }
 
     Image {
diff --git a/examples/declarative/webview/content/Mapping/Map.qml b/examples/declarative/webview/content/Mapping/Map.qml
index 6c3b021..38c42dd 100644
--- a/examples/declarative/webview/content/Mapping/Map.qml
+++ b/examples/declarative/webview/content/Mapping/Map.qml
@@ -6,16 +6,21 @@ Item {
     property real latitude: -34.397
     property real longitude: 150.644
     property string address: ""
+    property alias status: js.status
     WebView {
         id: map
         anchors.fill: parent
         url: "map.html"
         javaScriptWindowObjects: QtObject {
+            id: js
             WebView.windowObjectName: "qml"
             property real lat: page.latitude
             property real lng: page.longitude
             property string address: page.address
-            onAddressChanged: {map.evaluateJavaScript("goToAddress()")}
+            property string status: "Loading"
+            onAddressChanged: { if (map.url != "" && map.progress==1) map.evaluateJavaScript("goToAddress()") }
         }
+        pressGrabTime: 0
+        onLoadFinished: { evaluateJavaScript("goToAddress()"); }
     }
 }
diff --git a/examples/declarative/webview/content/Mapping/map.html b/examples/declarative/webview/content/Mapping/map.html
index 72f426a..a8726fd 100755
--- a/examples/declarative/webview/content/Mapping/map.html
+++ b/examples/declarative/webview/content/Mapping/map.html
@@ -33,9 +33,14 @@
         }
         if (map)
             req.bounds = map.getBounds()
+        window.qml.status = "Loading";
         geocoder.geocode(req, function(results, status) {
-          if (status == google.maps.GeocoderStatus.OK)
+          if (status == google.maps.GeocoderStatus.OK) {
+            window.qml.status = "Ready";
             goToLatLng(results[0].geometry.location,results[0].geometry.bounds);
+          } else {
+            window.qml.status = "Error";
+          }
         });
       }
   }
diff --git a/examples/declarative/webview/content/SpinSquare.qml b/examples/declarative/webview/content/SpinSquare.qml
index 466c99e..62c0ce2 100644
--- a/examples/declarative/webview/content/SpinSquare.qml
+++ b/examples/declarative/webview/content/SpinSquare.qml
@@ -15,10 +15,10 @@ Item {
             width: root.width
             height: width
         }
-        rotation: NumberAnimation {
+        NumberAnimation on rotation {
             from: 0
             to: 360
-            repeat: true
+            loops: Animation.Infinite
             duration: root.period
         }
     }
diff --git a/examples/declarative/webview/evalandattach.html b/examples/declarative/webview/evalandattach.html
deleted file mode 100644
index 48a1c33..0000000
--- a/examples/declarative/webview/evalandattach.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<body bgcolor=gray onload="ftext.confirmed.connect (ftext_confirmed); ">
-    <script>
-      do_it = function () {var oPressed = document.getElementById('pressed');
-      oPressed.innerHTML = 'MouseArea in QML clicked!';};
-      ftext_confirmed = function () { statusText1.text = ftext.text; var oT = document.getElementById('htmlTextInput'); oT.value = ftext.text }
-    </script>
-    <table border=1>
-      <tr>
-        <td>&nbsp</td>
-        <td id='pressed'></td>
-      </tr>
-      <tr>
-        <td><label for='htmlTextInput'>Type something:</label></td>
-        <td><input type='text' name='htmlTextInput' size='25' id='htmlTextInput'
-		   onfocus="statusText2.text = 'Focus in html text input.'"></td>
-      </tr>
-      <tr>
-        <td><label for='htmlButton'>&nbsp;</label></td>
-        <td>
-          <input type='button' id='htmlButton' value='Push'
-		 onclick="var oText = document.getElementById('htmlTextInput'); statusText1.text = oText.value; ftext.text = oText.value" />
-      </tr>
-    </table>
-    <p>
-      Below a qml(QFxItem) object inside webkit:
-    </p>
-    <object data=content/FieldText.qml TYPE=application/x-qt-plugin id="ftext_id" text="" label="Cool:" width="200" 
-	    objectname="ftext">
-      </object>
-</body>
-
diff --git a/examples/declarative/webview/evalandattach.qml b/examples/declarative/webview/evalandattach.qml
deleted file mode 100644
index d219d84..0000000
--- a/examples/declarative/webview/evalandattach.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-import Qt 4.6
-import org.webkit 1.0
-
-Item {
-    height: 640
-    width: 360
-    Text {
-        id: teksti
-        text: webView.statusText1
-        anchors.top: parent.top
-        height: 30
-        anchors.left: parent.left
-        width: parent.width/2
-    }
-
-    Text {
-        id: teksti2
-        text: webView.statusText2
-        anchors.top: parent.top
-        height: 30
-        anchors.left: teksti.right
-        anchors.right: parent.right
-    }
-
-    MouseArea {
-        anchors.fill: teksti
-        onClicked: { webView.evaluateJavaScript ("do_it()") }
-    }
-
-    WebView {
-        id: webView
-        property alias statusText1: txt.text
-        property alias statusText2: txt2.text
-        anchors.top: teksti.bottom
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        focus: true
-        settings.pluginsEnabled: true
-        javaScriptWindowObjects: [
-        QtObject {
-            id: txt
-            WebView.windowObjectName: "statusText1"
-            property string text: "Click me!"
-        },
-        QtObject {
-            id: txt2
-            WebView.windowObjectName: "statusText2"
-            property string text: ""
-        }
-        ]
-        url: "evalandattach.html"
-    }
-
-}
diff --git a/examples/declarative/webview/googleMaps.qml b/examples/declarative/webview/googleMaps.qml
index a04fecb..a0926f5 100644
--- a/examples/declarative/webview/googleMaps.qml
+++ b/examples/declarative/webview/googleMaps.qml
@@ -21,6 +21,7 @@ Map {
         radius: 5
         anchors.bottom: parent.bottom
         anchors.bottomMargin: 5
+        opacity: map.status == "Ready" ? 1 : 0
         x: 70
         TextInput {
             id: input
@@ -29,4 +30,12 @@ Map {
             Keys.onReturnPressed: map.address = input.text
         }
     }
+    Text {
+        id: loading
+        anchors.centerIn: parent
+        text: map.status == "Error" ? "Error" : "Loading"
+        opacity: map.status == "Ready" ? 0 : 1
+        font.pixelSize: 30
+        Behavior on opacity {NumberAnimation{}}
+    }
 }
diff --git a/examples/declarative/webview/qdeclarative-in-html.qml b/examples/declarative/webview/qdeclarative-in-html.qml
deleted file mode 100644
index 172ea4b..0000000
--- a/examples/declarative/webview/qdeclarative-in-html.qml
+++ /dev/null
@@ -1,33 +0,0 @@
-import Qt 4.6
-import org.webkit 1.0
-
-// The WebView supports QML data through the HTML OBJECT tag
-Rectangle {
-    color:"blue"
-    Flickable {
-        width: parent.width
-        height: parent.height/2
-        contentWidth: web.width*web.scale
-        contentHeight: web.height*web.scale
-        WebView {
-            id: web
-            width: 250
-            height: 420
-            zoomFactor: 0.75
-            smoothCache: true
-            settings.pluginsEnabled: true
-            html: "<html>\
-                <body bgcolor=white>\
-                    These are QML plugins, shown in a QML WebView via HTML OBJECT tags, all scaled to 75%\
-                    and placed in a Flickable area...\
-                    <table border=1>\
-                        <tr><th>Duration <th>Color <th>Plugin\
-                        <tr><td>500      <td>red   <td><OBJECT data=content/SpinSquare.qml TYPE=application/x-qt-plugin width=100 height=100 period=500 color=red />\
-                        <tr><td>2000     <td>blue  <td><OBJECT data=content/SpinSquare.qml TYPE=application/x-qt-plugin width=100 height=100 period=2000 color=blue />\
-                        <tr><td>1000     <td>green <td><OBJECT data=content/SpinSquare.qml TYPE=application/x-qt-plugin width=100 height=100 period=1000 color=green />\
-                    </table>\
-                </body>\
-                </html>"
-        }
-    }
-}