Merge lp:~zsombi/ubuntu-ui-toolkit/fix-behavior-crashes into lp:ubuntu-ui-toolkit

[Zsombor Egri]

Fix crashing on styled Behaviors in delegates.

Fix crashing on styled Behaviors in delegates.

=== modified file 'themes/Ambiance/qmltheme/CheckBoxDelegate.qml'
--- themes/Ambiance/qmltheme/CheckBoxDelegate.qml	2013-01-10 15:10:38 +0000
+++ themes/Ambiance/qmltheme/CheckBoxDelegate.qml	2013-02-01 11:52:25 +0000
@@ -27,7 +27,12 @@
         anchors.fill: parent
         color: item.checked ? StyleUtils.itemStyleProperty("checkedColor") : StyleUtils.itemStyleProperty("uncheckedColor")
         gradientColor: "transparent"
-        Behavior on color { animation: StyleUtils.itemStyleProperty("backgroundColorAnimation") }
+        Behavior on color {
+            ColorAnimation {
+                duration: StyleUtils.itemStyleProperty("backgroundColorAnimation").duration
+                easing: StyleUtils.itemStyleProperty("backgroundColorAnimation").easing
+            }
+        }
     }
 
     Image {
 
=== modified file 'themes/Ambiance/qmltheme/ScrollbarDelegate.qml'
--- themes/Ambiance/qmltheme/ScrollbarDelegate.qml	2013-01-11 17:44:58 +0000
+++ themes/Ambiance/qmltheme/ScrollbarDelegate.qml	2013-02-01 11:52:25 +0000
@@ -239,11 +239,17 @@
 
         Behavior on width {
             enabled: (!isVertical)
-            animation: StyleUtils.itemStyleProperty("sliderAnimation")
+            NumberAnimation {
+                duration: StyleUtils.itemStyleProperty("sliderAnimation").duration
+                easing: StyleUtils.itemStyleProperty("sliderAnimation").easing
+            }
         }
         Behavior on height {
             enabled: (isVertical)
-            animation: StyleUtils.itemStyleProperty("sliderAnimation")
+            NumberAnimation {
+                duration: StyleUtils.itemStyleProperty("sliderAnimation").duration
+                easing: StyleUtils.itemStyleProperty("sliderAnimation").easing
+            }
         }
 
         function scroll(amount) {
@@ -271,7 +277,12 @@
         }
         color: StyleUtils.itemStyleProperty("thumbConnectorColor", "white")
         opacity: thumb.shown ? 1.0 : 0.0
-        Behavior on opacity { animation: StyleUtils.itemStyleProperty("thumbConnectorFading") }
+        Behavior on opacity {
+            NumberAnimation {
+                duration: StyleUtils.itemStyleProperty("thumbConnectorFading").duration
+                easing: StyleUtils.itemStyleProperty("thumbConnectorFading").easing
+            }
+        }
     }
 
     MouseArea {
@@ -432,7 +443,12 @@
         }
 
         opacity: shown ? (thumbArea.containsMouse || thumbArea.drag.active ? 1.0 : 0.5) : 0.0
-        Behavior on opacity { animation: StyleUtils.itemStyleProperty("thumbFading") }
+        Behavior on opacity {
+            NumberAnimation {
+                duration: StyleUtils.itemStyleProperty("thumbFading").duration
+                easing: StyleUtils.itemStyleProperty("thumbFading").easing
+            }
+        }
 
         property url backwardPressed: StyleUtils.itemStyleProperty("backwardThumbPressed", "")
         property url backwardReleased: StyleUtils.itemStyleProperty("backwardThumbReleased", "")
 
=== modified file 'themes/Ambiance/qmltheme/SwitchDelegate.qml'
--- themes/Ambiance/qmltheme/SwitchDelegate.qml	2013-01-15 20:29:48 +0000
+++ themes/Ambiance/qmltheme/SwitchDelegate.qml	2013-02-01 11:52:25 +0000
@@ -43,8 +43,18 @@
                                 : StyleUtils.itemStyleProperty("uncheckedThumbColor", "grey")
             gradientColor: "transparent"
 
-            Behavior on x { animation: StyleUtils.itemStyleProperty("moveThumbAnimation") }
-            Behavior on color { animation: StyleUtils.itemStyleProperty("thumbColorAnimation") }
+            Behavior on x {
+                NumberAnimation {
+                    duration: StyleUtils.itemStyleProperty("moveThumbAnimation").duration
+                    easing: StyleUtils.itemStyleProperty("moveThumbAnimation").easing
+                }
+            }
+            Behavior on color {
+                ColorAnimation {
+                    duration: StyleUtils.itemStyleProperty("thumbColorAnimation").duration
+                    easing: StyleUtils.itemStyleProperty("thumbColorAnimation").easing
+                }
+            }
         }
 
         Item {