diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-29 10:48:54 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-29 10:48:54 +0100 |
| commit | 4e33b069c426c975319d91e11223114fd0d8ad40 (patch) | |
| tree | d73e1251bc313b7303fdb000c0789cdfb4c7bb1f /src/quick/util/qquickanimatorjob.cpp | |
| parent | d9e70d1a49af347f79db7e64bdd8e2e8083a77b5 (diff) | |
| parent | 05d8ffb4dff5e693967c8ee7cee6d6158eadccbd (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/quick/items/qquickaccessibleattached_p.h
src/quick/items/qquickwindow.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp
Change-Id: I8bf07487a75f9d1b0d6efa5914dd06875fc9654d
Diffstat (limited to 'src/quick/util/qquickanimatorjob.cpp')
| -rw-r--r-- | src/quick/util/qquickanimatorjob.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp index 8c72c09738..536413bba9 100644 --- a/src/quick/util/qquickanimatorjob.cpp +++ b/src/quick/util/qquickanimatorjob.cpp @@ -85,6 +85,8 @@ QQuickAnimatorProxyJob::QQuickAnimatorProxyJob(QAbstractAnimationJob *job, QObje QQuickAnimatorProxyJob::~QQuickAnimatorProxyJob() { deleteJob(); + if (m_controller) + m_controller->proxyWasDestroyed(this); } void QQuickAnimatorProxyJob::deleteJob() @@ -179,15 +181,6 @@ void QQuickAnimatorProxyJob::startedByController() m_internalState = State_Running; } -bool QQuickAnimatorProxyJob::event(QEvent *e) -{ - if (e->type() == QEvent::User) { - stop(); - return true; - } - return QObject::event(e); -} - static void qquick_syncback_helper(QAbstractAnimationJob *job) { if (job->isRenderThreadJob()) { |