diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-12 13:28:30 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-15 13:08:25 +0000 |
| commit | 8cb5d8b5c670a01063786099c76340f061a589ae (patch) | |
| tree | 22386fc79ba10840e1fa08d3ede484903ba3f610 | |
| parent | 49b7ce333d52a5da0a88fca2e35b64116fe77939 (diff) | |
Tumbler: cleanup internal IDs
Same as d61567f in 5.9, but for the new styles in 5.10.
Task-number: QTBUG-50992
Change-Id: If47df3796eeadb997bfc76ce6dd6a3b14372ff2b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/fusion/Tumbler.qml | 10 | ||||
| -rw-r--r-- | src/imports/controls/imagine/Tumbler.qml | 9 | ||||
| -rw-r--r-- | tests/auto/sanity/BLACKLIST | 4 |
3 files changed, 8 insertions, 15 deletions
diff --git a/src/imports/controls/fusion/Tumbler.qml b/src/imports/controls/fusion/Tumbler.qml index 6f06e8f5..d53b6845 100644 --- a/src/imports/controls/fusion/Tumbler.qml +++ b/src/imports/controls/fusion/Tumbler.qml @@ -47,7 +47,6 @@ T.Tumbler { implicitHeight: 200 delegate: Text { - id: label text: modelData color: control.palette.windowText font: control.font @@ -57,15 +56,14 @@ T.Tumbler { } contentItem: TumblerView { - id: tumblerView model: control.model delegate: control.delegate path: Path { - startX: tumblerView.width / 2 - startY: -tumblerView.delegateHeight / 2 + startX: contentItem.width / 2 + startY: -contentItem.delegateHeight / 2 PathLine { - x: tumblerView.width / 2 - y: (control.visibleItemCount + 1) * tumblerView.delegateHeight - tumblerView.delegateHeight / 2 + x: contentItem.width / 2 + y: (control.visibleItemCount + 1) * contentItem.delegateHeight - contentItem.delegateHeight / 2 } } diff --git a/src/imports/controls/imagine/Tumbler.qml b/src/imports/controls/imagine/Tumbler.qml index 5e1c913c..17f6c562 100644 --- a/src/imports/controls/imagine/Tumbler.qml +++ b/src/imports/controls/imagine/Tumbler.qml @@ -56,15 +56,14 @@ T.Tumbler { } contentItem: TumblerView { - id: tumblerView model: control.model delegate: control.delegate path: Path { - startX: tumblerView.width / 2 - startY: -tumblerView.delegateHeight / 2 + startX: contentItem.width / 2 + startY: -contentItem.delegateHeight / 2 PathLine { - x: tumblerView.width / 2 - y: (control.visibleItemCount + 1) * tumblerView.delegateHeight - tumblerView.delegateHeight / 2 + x: contentItem.width / 2 + y: (control.visibleItemCount + 1) * contentItem.delegateHeight - contentItem.delegateHeight / 2 } } diff --git a/tests/auto/sanity/BLACKLIST b/tests/auto/sanity/BLACKLIST index 841819f7..8066f40b 100644 --- a/tests/auto/sanity/BLACKLIST +++ b/tests/auto/sanity/BLACKLIST @@ -4,8 +4,6 @@ * [ids:fusion/ComboBox.qml] * -[ids:fusion/Tumbler.qml] -* [ids:imagine/BusyIndicator.qml] * [ids:imagine/DelayButton.qml] @@ -22,5 +20,3 @@ * [ids:imagine/SwitchDelegate.qml] * -[ids:imagine/Tumbler.qml] -* |