aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/universal/ScrollIndicator.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2018-01-16 09:37:42 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2018-01-16 09:38:19 +0100
commit08e6333450bc28c61fa804101df3ae8bef4e9568 (patch)
treeacb8973cbbd2319ab75e460e35a3278459d717df /src/imports/controls/universal/ScrollIndicator.qml
parentef5e426bed3b1362394c7cc0c97522bb20cacff0 (diff)
parent744d14b468eb4bdd4dabf72ef7acdca1bc07ea5d (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Diffstat (limited to 'src/imports/controls/universal/ScrollIndicator.qml')
-rw-r--r--src/imports/controls/universal/ScrollIndicator.qml6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/imports/controls/universal/ScrollIndicator.qml b/src/imports/controls/universal/ScrollIndicator.qml
index 029efe4c..f09124db 100644
--- a/src/imports/controls/universal/ScrollIndicator.qml
+++ b/src/imports/controls/universal/ScrollIndicator.qml
@@ -47,8 +47,6 @@ T.ScrollIndicator {
contentItem.implicitHeight + topPadding + bottomPadding)
contentItem: Rectangle {
- id: indicator
-
implicitWidth: 6
implicitHeight: 6
@@ -66,13 +64,13 @@ T.ScrollIndicator {
transitions: [
Transition {
to: "active"
- NumberAnimation { target: indicator; property: "opacity"; to: 1.0 }
+ NumberAnimation { target: control.contentItem; property: "opacity"; to: 1.0 }
},
Transition {
from: "active"
SequentialAnimation {
PauseAnimation { duration: 5000 }
- NumberAnimation { target: indicator; property: "opacity"; to: 0.0 }
+ NumberAnimation { target: control.contentItem; property: "opacity"; to: 0.0 }
}
}
]