diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-25 15:03:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-25 15:03:03 +0200 |
| commit | 3e20d1059a612ba5a6d3c049fe93f780f3ba3e58 (patch) | |
| tree | ee20524e6bf4cfb41ea5b3bf867bc546abf9edd9 /src/quick/util | |
| parent | 1aa91f8b0b140c417c6e97dfd22fa498d31bceb6 (diff) | |
| parent | 2416b9d6cc2950395151c18a7f7bfceb4b7fc693 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3
Change-Id: Ie5d0b2d9bece98553262f8af1ce66459f03a73e1
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickanimatorjob.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp index a7950e2b33..43c8eb302a 100644 --- a/src/quick/util/qquickanimatorjob.cpp +++ b/src/quick/util/qquickanimatorjob.cpp @@ -197,8 +197,12 @@ void QQuickAnimatorProxyJob::windowChanged(QQuickWindow *window) void QQuickAnimatorProxyJob::setWindow(QQuickWindow *window) { if (!window) { - if (m_job && m_controller) + if (m_job && m_controller) { + disconnect(m_controller->window(), &QQuickWindow::sceneGraphInitialized, + this, &QQuickAnimatorProxyJob::sceneGraphInitialized); m_controller->cancel(m_job); + } + m_controller = nullptr; stop(); |