diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-05 11:08:59 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-05 11:08:59 +0200 |
| commit | 2746518c76e02c642ff29faf568de4de90216e58 (patch) | |
| tree | 822a6d979c13b6450c221b2a45ccfb6674bcb8e4 /src/particles/qquickparticlepainter.cpp | |
| parent | 9e32b23a1514f367921b4a9ee25bc864a008463c (diff) | |
| parent | bdf0a46c289298f7378796d62ae5fb283e08657d (diff) | |
| download | qtdeclarative-wip/qt6.tar.gz | |
Merge remote-tracking branch 'origin/dev' into wip/qt6wip/qt6
Conflicts:
.qmake.conf
src/qml/qml/qqmlengine.cpp
src/qmlmodels/qqmlmodelsmodule.cpp
Change-Id: Id60420f8250a9c97fcfe56d4eea19b62c6870404
Diffstat (limited to 'src/particles/qquickparticlepainter.cpp')
| -rw-r--r-- | src/particles/qquickparticlepainter.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/particles/qquickparticlepainter.cpp b/src/particles/qquickparticlepainter.cpp index e762b3ae1d..78e11fafcf 100644 --- a/src/particles/qquickparticlepainter.cpp +++ b/src/particles/qquickparticlepainter.cpp @@ -70,6 +70,7 @@ QQuickParticlePainter::QQuickParticlePainter(QQuickItem *parent) , m_count(0) , m_pleaseReset(true) , m_window(nullptr) + , m_windowChanged(false) , m_groupIdsNeedRecalculation(false) { } @@ -80,6 +81,7 @@ void QQuickParticlePainter::itemChange(ItemChange change, const ItemChangeData & if (m_window) disconnect(m_window, SIGNAL(sceneGraphInvalidated()), this, SLOT(sceneGraphInvalidated())); m_window = data.window; + m_windowChanged = true; if (m_window) connect(m_window, SIGNAL(sceneGraphInvalidated()), this, SLOT(sceneGraphInvalidated()), Qt::DirectConnection); } |