diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-18 11:05:36 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-18 11:29:38 +0000 |
| commit | 035990f2695e57526e5960b55fdefdaea3299ecb (patch) | |
| tree | 85b9638f47fd6f609a99fe5b740be7822260e416 | |
| parent | 47168eb73bbe888042a1735e424ae35c9af04e2f (diff) | |
Imagine/BusyIndicator: cleanup internal IDs for deferred execution
Task-number: QTBUG-50992
Change-Id: Idee1a13355e36e9221b32cdf9b89b4090dcf87b4
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/imagine/BusyIndicator.qml | 6 | ||||
| -rw-r--r-- | tests/auto/sanity/BLACKLIST | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/imports/controls/imagine/BusyIndicator.qml b/src/imports/controls/imagine/BusyIndicator.qml index a1ce3f7b..28585ab1 100644 --- a/src/imports/controls/imagine/BusyIndicator.qml +++ b/src/imports/controls/imagine/BusyIndicator.qml @@ -53,10 +53,10 @@ T.BusyIndicator { bottomPadding: background ? background.bottomPadding : 0 contentItem: AnimatedImage { - playing: control.running opacity: control.running ? 1 : 0 - visible: control.running || animator.running - Behavior on opacity { OpacityAnimator { id: animator; duration: 250 } } + playing: control.running || opacity > 0 + visible: control.running || opacity > 0 + Behavior on opacity { OpacityAnimator { duration: 250 } } source: Imagine.url + "busyindicator-animation" AnimatedImageSelector on source { diff --git a/tests/auto/sanity/BLACKLIST b/tests/auto/sanity/BLACKLIST index ab9673a7..c34a6ebd 100644 --- a/tests/auto/sanity/BLACKLIST +++ b/tests/auto/sanity/BLACKLIST @@ -2,8 +2,6 @@ * [attachedObjects:material/SwitchDelegate.qml] * -[ids:imagine/BusyIndicator.qml] -* [ids:imagine/DelayButton.qml] * [ids:imagine/ProgressBar.qml] |