diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-17 15:51:18 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-18 11:29:32 +0000 |
| commit | c9cbee192263998bd3a9fe9d1414a4b539b9e4a2 (patch) | |
| tree | b03518ecb1583fc540cc7fa7cd8f3d9b29b95ab7 | |
| parent | 96e16e3501c23bc97e2a60cc78e57aaff7177019 (diff) | |
Imagine/SpinBox: cleanup internal IDs for deferred execution
Task-number: QTBUG-50992
Change-Id: Iaabd561b2bd009d3db970f370eff6fa717164961
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/imagine/SpinBox.qml | 6 | ||||
| -rw-r--r-- | tests/auto/sanity/BLACKLIST | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/imports/controls/imagine/SpinBox.qml b/src/imports/controls/imagine/SpinBox.qml index ebadb860..1870148e 100644 --- a/src/imports/controls/imagine/SpinBox.qml +++ b/src/imports/controls/imagine/SpinBox.qml @@ -98,7 +98,6 @@ T.SpinBox { } up.indicator: NinePatchImage { - id: upIndicator x: control.mirrored ? 0 : parent.width - width height: parent.height @@ -106,7 +105,7 @@ T.SpinBox { NinePatchImageSelector on source { states: [ {"up": true}, - {"disabled": !upIndicator.enabled}, + {"disabled": !control.up.indicator.enabled}, {"editable": control.editable}, {"pressed": control.up.pressed}, {"focused": control.activeFocus}, @@ -117,7 +116,6 @@ T.SpinBox { } down.indicator: NinePatchImage { - id: downIndicator x: control.mirrored ? parent.width - width : 0 height: parent.height @@ -125,7 +123,7 @@ T.SpinBox { NinePatchImageSelector on source { states: [ {"down": true}, - {"disabled": !downIndicator.enabled}, + {"disabled": !control.down.indicator.enabled}, {"editable": control.editable}, {"pressed": control.down.pressed}, {"focused": control.activeFocus}, diff --git a/tests/auto/sanity/BLACKLIST b/tests/auto/sanity/BLACKLIST index 94e4fd32..b2038576 100644 --- a/tests/auto/sanity/BLACKLIST +++ b/tests/auto/sanity/BLACKLIST @@ -12,8 +12,6 @@ * [ids:imagine/ProgressBar.qml] * -[ids:imagine/SpinBox.qml] -* [ids:imagine/Switch.qml] * [ids:imagine/SwitchDelegate.qml] |