diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:26:56 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:26:56 +0200 |
commit | b8f309338ceb7c24834bb1a41084fa8f85d6659b (patch) | |
tree | 6a43f6dc73a8ecd3dabc6fefaf5a65742b553d17 /src/animation/frontend | |
parent | 4cb940c170a5df68893e333b70212a6073ee6294 (diff) | |
parent | 409a879f3617a7db7f3abfb3408f2530c139b24b (diff) |
Merge dev into 5.10
Change-Id: I1bef655947a7176f7931c7f1b8ed4c4176395451
Diffstat (limited to 'src/animation/frontend')
-rw-r--r-- | src/animation/frontend/qabstractclipanimator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/animation/frontend/qabstractclipanimator.cpp b/src/animation/frontend/qabstractclipanimator.cpp index d72085b6e..78ad01508 100644 --- a/src/animation/frontend/qabstractclipanimator.cpp +++ b/src/animation/frontend/qabstractclipanimator.cpp @@ -150,7 +150,7 @@ QChannelMapper *QAbstractClipAnimator::channelMapper() const } /*! - \qmlproperty int QAbstractClipAnimator::loops + \qmlproperty int AbstractClipAnimator::loops This property holds the number of times the animation should play. |