diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-17 10:34:17 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-17 10:34:17 +0200 |
commit | 1a62cad4a6b9a962874554e735b5db53169a8e56 (patch) | |
tree | 11db8c17204cc7f74c7029da0f08636ecaf6f36b /src/quick | |
parent | 9c4174f9f3fa4a0c46b11b3160d1b45d19bf66af (diff) | |
parent | 5ead393eba0fc9d7c05790887c53c3728b023195 (diff) |
Merge remote-tracking branch 'origin/5.12.3' into 5.12
Change-Id: Ie2e6a4af1953cb5d7965b95090d369e7433ceb85
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/util/qquickanimation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index 02be9daac0..2043b50545 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -812,7 +812,7 @@ QQuickColorAnimation::~QQuickColorAnimation() // States are defined here... ] - transition: Transition { + transitions: Transition { ColorAnimation { from: "#c0c0c0"; duration: 2000 } } } |