diff options
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 1 | ||||
| -rw-r--r-- | src/quick/items/qquicktranslate.cpp | 1 | ||||
| -rw-r--r-- | src/quick/util/qquickanimatorjob.cpp | 6 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index bfe67a0dd4..ccc4e90abf 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -122,6 +122,7 @@ void debugFocusTree(QQuickItem *item, QQuickItem *scope = 0, int depth = 1) \li \l Rotation \li \l Scale \li \l Translate + \li \l Matrix4x4 \endlist The Transform types let you create and control advanced transformations that can be configured diff --git a/src/quick/items/qquicktranslate.cpp b/src/quick/items/qquicktranslate.cpp index 9937c692a5..1c8dd02b92 100644 --- a/src/quick/items/qquicktranslate.cpp +++ b/src/quick/items/qquicktranslate.cpp @@ -467,6 +467,7 @@ public: \instantiates QQuickMatrix4x4 \inqmlmodule QtQuick \ingroup qtquick-visual-transforms + \since 5.3 \brief Provides a way to apply a 4x4 tranformation matrix to an \l Item The Matrix4x4 type provides a way to apply a transformation to an 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(); |