Merge branch 'master' into 4.7

17 files changed, 28 insertions, 31 deletions

diff --git a/demos/declarative/flickr/common/Loading.qml b/demos/declarative/flickr/common/Loading.qml
index 174cd21..938a080 100644
--- a/demos/declarative/flickr/common/Loading.qml
+++ b/demos/declarative/flickr/common/Loading.qml
@@ -2,7 +2,7 @@ import Qt 4.6
 
 Image {
     id: loading; source: "pics/loading.png"; transformOrigin: "Center"
-    rotation: NumberAnimation {
+    NumberAnimation on rotation {
         from: 0; to: 360; running: loading.visible == true; repeat: true; duration: 900
     }
 }
diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml
index 7634573..291d874 100644
--- a/demos/declarative/flickr/mobile/GridDelegate.qml
+++ b/demos/declarative/flickr/mobile/GridDelegate.qml
@@ -23,7 +23,7 @@
          Item {
              anchors.centerIn: parent
              scale: 0.0
-             scale: Behavior { NumberAnimation { easing.type: "InOutQuad"} }
+             Behavior on scale { NumberAnimation { easing.type: "InOutQuad"} }
              id: scaleMe
 
              Rectangle { height: 79; width: 79; id: blackRect;  anchors.centerIn: parent; color: "black"; smooth: true }
diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml
index c51371c..2f4df8a 100644
--- a/demos/declarative/flickr/mobile/ImageDetails.qml
+++ b/demos/declarative/flickr/mobile/ImageDetails.qml
@@ -45,7 +45,7 @@ Flipable {
             Text { color: "white"; elide: Text.ElideRight; text: "<b>Author:</b> " + container.photoAuthor }
             Text { color: "white"; elide: Text.ElideRight; text: "<b>Published:</b> " + container.photoDate }
             Text { color: "white"; elide: Text.ElideRight; text: container.photoTags == "" ? "" : "<b>Tags:</b> " }
-            Text { color: "white"; elide: Text.ElideRight; elide: Text.ElideRight; text: container.photoTags }
+            Text { color: "white"; elide: Text.ElideRight; text: container.photoTags }
         }
     }
 
diff --git a/demos/declarative/flickr/mobile/ListDelegate.qml b/demos/declarative/flickr/mobile/ListDelegate.qml
index 75c4572..381664b 100644
--- a/demos/declarative/flickr/mobile/ListDelegate.qml
+++ b/demos/declarative/flickr/mobile/ListDelegate.qml
@@ -15,8 +15,8 @@ Component {
             Column {
                 x: 92; width: wrapper.ListView.view.width - 95; y: 15; spacing: 2
                 Text { text: title; color: "white"; width: parent.width; font.bold: true; elide: Text.ElideRight; style: Text.Raised; styleColor: "black" }
-                Text { text: photoAuthor; color: "white"; width: parent.width; elide: Text.ElideLeft; color: "#cccccc"; style: Text.Raised; styleColor: "black" }
-                Text { text: photoDate; color: "white"; width: parent.width; elide: Text.ElideRight; color: "#cccccc"; style: Text.Raised; styleColor: "black" }
+                Text { text: photoAuthor; width: parent.width; elide: Text.ElideLeft; color: "#cccccc"; style: Text.Raised; styleColor: "black" }
+                Text { text: photoDate; width: parent.width; elide: Text.ElideRight; color: "#cccccc"; style: Text.Raised; styleColor: "black" }
             }
         }
     }
diff --git a/demos/declarative/minehunt/main.cpp b/demos/declarative/minehunt/main.cpp
index e7a1d7c..99856ed 100644
--- a/demos/declarative/minehunt/main.cpp
+++ b/demos/declarative/minehunt/main.cpp
@@ -101,7 +101,7 @@ public:
     ~MyWidget();
 
     Q_PROPERTY(QDeclarativeListProperty<Tile> tiles READ tiles CONSTANT);
-    QDeclarativeListProperty<Tile> tiles() { return _tilesProperty; }
+    QDeclarativeListProperty<Tile> tiles() { return QDeclarativeListProperty<Tile>(this, _tiles); }
 
     Q_PROPERTY(bool isPlaying READ isPlaying NOTIFY isPlayingChanged);
     bool isPlaying() {return playing;}
@@ -136,7 +136,6 @@ private:
     QDeclarativeView *canvas;
 
     QList<Tile *> _tiles;
-    QDeclarativeListProperty<Tile> _tilesProperty;
     int numCols;
     int numRows;
     bool playing;
@@ -167,8 +166,6 @@ MyWidget::MyWidget(int width, int height, QWidget *parent, Qt::WindowFlags flags
     canvas->setFixedSize(width, height);
     vbox->addWidget(canvas);
 
-    _tilesProperty = QDeclarativeListProperty<Tile>(this, _tiles);
-
     QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->addDefaultObject(this);
 
diff --git a/demos/declarative/minehunt/minehunt.qml b/demos/declarative/minehunt/minehunt.qml
index 8a3cab1..456f25b 100644
--- a/demos/declarative/minehunt/minehunt.qml
+++ b/demos/declarative/minehunt/minehunt.qml
@@ -32,7 +32,7 @@ Item {
                         anchors.verticalCenter: parent.verticalCenter
                         source: "pics/flag.png"
                         opacity: modelData.hasFlag
-                        opacity: Behavior {
+                        Behavior on opacity {
                             NumberAnimation {
                                 property: "opacity"
                                 duration: 250
diff --git a/demos/declarative/samegame/content/BoomBlock.qml b/demos/declarative/samegame/content/BoomBlock.qml
index 723e62a..e48194a 100644
--- a/demos/declarative/samegame/content/BoomBlock.qml
+++ b/demos/declarative/samegame/content/BoomBlock.qml
@@ -7,8 +7,8 @@ Item { id:block
     property int targetX: 0
     property int targetY: 0
 
-    x: SpringFollow { enabled: spawned; source: targetX; spring: 2; damping: 0.2 }
-    y: SpringFollow { source: targetY; spring: 2; damping: 0.2 }
+    SpringFollow on x { enabled: spawned; source: targetX; spring: 2; damping: 0.2 }
+    SpringFollow on y { source: targetY; spring: 2; damping: 0.2 }
 
     Image { id: img
         source: {
@@ -21,7 +21,7 @@ Item { id:block
             }
         }
         opacity: 0
-        opacity: Behavior { NumberAnimation { duration: 200 } }
+        Behavior on opacity { NumberAnimation { duration: 200 } }
         anchors.fill: parent
     }
 
diff --git a/demos/declarative/samegame/content/Dialog.qml b/demos/declarative/samegame/content/Dialog.qml
index 7769328..6d5d6b5 100644
--- a/demos/declarative/samegame/content/Dialog.qml
+++ b/demos/declarative/samegame/content/Dialog.qml
@@ -14,7 +14,7 @@ Rectangle {
     property Item text: myText
     color: "white"; border.width: 1; width: myText.width + 20; height: myText.height + 40;
     opacity: 0
-    opacity: Behavior {
+    Behavior on opacity {
         NumberAnimation { duration: 1000 }
     }
     Text { id: myText; anchors.centerIn: parent; text: "Hello World!" }
diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml
index 50f6293..c81f292 100644
--- a/demos/declarative/samegame/samegame.qml
+++ b/demos/declarative/samegame/samegame.qml
@@ -39,7 +39,7 @@ Rectangle {
     Dialog {
         id: scoreName; anchors.centerIn: parent; z: 22;
         property int initialWidth: 0
-        width: Behavior{NumberAnimation{} enabled: initialWidth!=0}
+        Behavior on width {NumberAnimation{} enabled: initialWidth!=0}
         Text {
             id: spacer
             anchors.left: scoreName.left
diff --git a/demos/declarative/snake/content/Cookie.qml b/demos/declarative/snake/content/Cookie.qml
index 7f0aadf..0ea95cb 100644
--- a/demos/declarative/snake/content/Cookie.qml
+++ b/demos/declarative/snake/content/Cookie.qml
@@ -17,7 +17,7 @@ Item  {
         anchors.fill: parent
         source: "pics/cookie.png"
         opacity: 0
-        opacity: Behavior { NumberAnimation { duration: 100 } }
+        Behavior on opacity { NumberAnimation { duration: 100 } }
         Text {
             font.bold: true
             anchors.verticalCenter: parent.verticalCenter
diff --git a/demos/declarative/snake/content/Link.qml b/demos/declarative/snake/content/Link.qml
index 1b3f7bf..31ac4b9 100644
--- a/demos/declarative/snake/content/Link.qml
+++ b/demos/declarative/snake/content/Link.qml
@@ -13,8 +13,8 @@ Item { id:link
 
     x: margin - 3 + gridSize * column
     y: margin - 3 + gridSize * row
-    x: Behavior { NumberAnimation { duration: spawned ? heartbeatInterval : 0} }
-    y: Behavior { NumberAnimation { duration: spawned ? heartbeatInterval : 0 } }
+    Behavior on x { NumberAnimation { duration: spawned ? heartbeatInterval : 0} }
+    Behavior on y { NumberAnimation { duration: spawned ? heartbeatInterval : 0 } }
 
 
     Item {
@@ -35,7 +35,7 @@ Item { id:link
                 id: actualImageRotation
                 origin.x: width/2; origin.y: height/2;
                 angle: rotation * 90
-                angle: Behavior{ NumberAnimation { duration: spawned ? 200 : 0} }
+                Behavior on angle { NumberAnimation { duration: spawned ? 200 : 0} }
             }
         }
 
@@ -44,7 +44,7 @@ Item { id:link
         }
 
         opacity: 0
-        opacity: Behavior { NumberAnimation { duration: 200 } }
+        Behavior on opacity { NumberAnimation { duration: 200 } }
     }
 
 
diff --git a/demos/declarative/snake/content/Skull.qml b/demos/declarative/snake/content/Skull.qml
index 585e7d3..821996a 100644
--- a/demos/declarative/snake/content/Skull.qml
+++ b/demos/declarative/snake/content/Skull.qml
@@ -9,11 +9,11 @@ Image {
 
     x: margin + column * gridSize + 2
     y: margin + row * gridSize - 3
-    x: Behavior { NumberAnimation { duration: spawned ? halfbeatInterval : 0} }
-    y: Behavior { NumberAnimation { duration: spawned ? halfbeatInterval : 0 } }
+    Behavior on x { NumberAnimation { duration: spawned ? halfbeatInterval : 0} }
+    Behavior on y { NumberAnimation { duration: spawned ? halfbeatInterval : 0 } }
 
     opacity: spawned ? 1 : 0
-    opacity: Behavior { NumberAnimation { duration: 200 } }
+    Behavior on opacity { NumberAnimation { duration: 200 } }
 
     source: "pics/skull.png"
     width: 24
diff --git a/demos/declarative/snake/content/snake.js b/demos/declarative/snake/content/snake.js
index a65aebc..12176c7 100644
--- a/demos/declarative/snake/content/snake.js
+++ b/demos/declarative/snake/content/snake.js
@@ -54,7 +54,7 @@ function startNewGame()
         } else {
             if(linkComponent.isReady == false){
                 if(linkComponent.isError == true)
-                    print(linkComponent.errorString());
+                    print(linkComponent.errorsString());
                 else
                     print("Still loading linkComponent");
                 continue;//TODO: Better error handling?
@@ -295,7 +295,7 @@ function createCookie(value) {
 
     if(cookieComponent.isReady == false){
         if(cookieComponent.isError == true)
-            print(cookieComponent.errorString());
+            print(cookieComponent.errorsString());
         else
             print("Still loading cookieComponent");
         return;//TODO: Better error handling?
diff --git a/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml
index 09b6b7f..f9d02c7 100644
--- a/demos/declarative/snake/snake.qml
+++ b/demos/declarative/snake/snake.qml
@@ -65,7 +65,7 @@ Rectangle {
             anchors.fill: parent
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
-            opacity: Behavior { NumberAnimation { duration: 500 } }
+            Behavior on opacity { NumberAnimation { duration: 500 } }
 
             Text {
                 color: "white"
@@ -121,7 +121,7 @@ Rectangle {
     Rectangle {
         id: progressBar
         opacity: 0
-        opacity: Behavior { NumberAnimation { duration: 200 } }
+        Behavior on opacity { NumberAnimation { duration: 200 } }
         color: "transparent"
         border.width: 2
         border.color: "#221edd"
@@ -137,7 +137,7 @@ Rectangle {
             id: progressIndicator
             color: "#221edd";
             width: 0;
-            width: Behavior { NumberAnimation { duration: startHeartbeatTimer.running ? 1000 : 0}}
+            Behavior on width { NumberAnimation { duration: startHeartbeatTimer.running ? 1000 : 0}}
             height: 30;
         }
     }
diff --git a/demos/declarative/twitter/content/FatDelegate.qml b/demos/declarative/twitter/content/FatDelegate.qml
index 2b9288b..0f013e6 100644
--- a/demos/declarative/twitter/content/FatDelegate.qml
+++ b/demos/declarative/twitter/content/FatDelegate.qml
@@ -37,7 +37,7 @@ Component {
                     + '<a href="app://@'+userScreenName+'"><b>'+userScreenName + "</b></a>  from " +source
                     + "<br /><b>" + addTags(statusText) + "</b></html>";
                 textFormat: Qt.RichText
-                color: "white"; color: "#cccccc"; style: Text.Raised; styleColor: "black"; wrap: true
+                color: "#cccccc"; style: Text.Raised; styleColor: "black"; wrap: true
                 anchors.left: whiteRect.right; anchors.right: blackRect.right; anchors.leftMargin: 6; anchors.rightMargin: 6
                 onLinkActivated: handleLink(link)
             }
diff --git a/demos/declarative/twitter/content/Loading.qml b/demos/declarative/twitter/content/Loading.qml
index 3151415..76bf64b 100644
--- a/demos/declarative/twitter/content/Loading.qml
+++ b/demos/declarative/twitter/content/Loading.qml
@@ -2,7 +2,7 @@ import Qt 4.6
 
 Image {
     id: loading; source: "images/loading.png"; transformOrigin: "Center"
-    rotation: NumberAnimation {
+    NumberAnimation on rotation {
         from: 0; to: 360; running: loading.visible == true; repeat: true; duration: 900
     }
 }
diff --git a/demos/declarative/twitter/twitter.qml b/demos/declarative/twitter/twitter.qml
index b091b03..0ea1309 100644
--- a/demos/declarative/twitter/twitter.qml
+++ b/demos/declarative/twitter/twitter.qml
@@ -35,7 +35,7 @@ Item {
         Text {
             width: 180
             text: "Could not access twitter using this screen name and password pair.";
-            color: "white"; color: "#cccccc"; style: Text.Raised; styleColor: "black"; wrap: true
+            color: "#cccccc"; style: Text.Raised; styleColor: "black"; wrap: true
             visible: rssModel.status==XmlListModel.Error; anchors.centerIn: parent
         }