diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-12 10:53:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-12 10:53:43 +0100 |
| commit | 20a51e87fd15b8a6c1503b905399f7befe31114b (patch) | |
| tree | 5a8667150568ed798d63eb165372c198549498c2 /src/quick/util/qquickanimator_p_p.h | |
| parent | 6c152bf27f94f01b2942b02e370df4fa01e0d40f (diff) | |
| parent | 084dbb06d7b00c4a67edb6ce58956150036c35f2 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.qmake.conf
Change-Id: I356ec83cf687bd2833f9a7c5e820d56b1efa8979
Diffstat (limited to 'src/quick/util/qquickanimator_p_p.h')
| -rw-r--r-- | src/quick/util/qquickanimator_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/util/qquickanimator_p_p.h b/src/quick/util/qquickanimator_p_p.h index 7a61462762..b176119c70 100644 --- a/src/quick/util/qquickanimator_p_p.h +++ b/src/quick/util/qquickanimator_p_p.h @@ -82,7 +82,7 @@ public: uint isFromDefined : 1; uint isToDefined : 1; - void apply(QQuickAnimatorJob *job, const QString &propertyName, QQuickStateActions &actions, QQmlProperties &modified); + void apply(QQuickAnimatorJob *job, const QString &propertyName, QQuickStateActions &actions, QQmlProperties &modified, QObject *defaultTarget); }; class QQuickRotationAnimatorPrivate : public QQuickAnimatorPrivate |