Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 0 insertions, 37 deletions

diff --git a/demos/declarative/phonebrowser/content/ScrollBar.qml b/demos/declarative/phonebrowser/content/ScrollBar.qml
deleted file mode 100644
index e65f92f..0000000
--- a/demos/declarative/phonebrowser/content/ScrollBar.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-Item {
-    property var flickableArea
-
-    id: Container
-    Rect {
-        radius: 5
-        color: "black"
-        opacity: 0.3
-        pen.color: "white"
-        pen.width: 2
-        x: 0
-        y: flickableArea.pageYPosition * Container.height
-        width: parent.width
-        height: flickableArea.pageHeight * Container.height
-    }
-    states: [
-        State {
-            name: "show"
-            when: flickableArea.moving
-            SetProperties {
-                target: Container
-                opacity: 1
-            }
-        }
-    ]
-    transitions: [
-        Transition {
-            fromState: "*"
-            toState: "*"
-            NumericAnimation {
-                target: Container
-                properties: "opacity"
-                duration: 400
-            }
-        }
-    ]
-}