diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2011-11-15 17:20:46 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-16 07:56:24 +0100 |
| commit | c560a38ac95e3febb1d39598a5c4de43c495b67c (patch) | |
| tree | 562f94cd08caa472650986eea64bf44d5ab494c1 /src/declarative/items | |
| parent | 93b6de38ad662bdfc1c89f11151ebe1fbbca96c7 (diff) | |
Avoid calling maybeUpdate() during ShaderEffectSource cleanup.
markDirtyTexture() causes sceneGraphChanged() to be emitted from
the renderer containing the ShaderEffectSource, which in turn
causes QQuickCanvasRenderThread::maybeUpdate() to be called.
Change-Id: I3c068e41501ed4cb2c5f4ff705ffd478743b4beb
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/declarative/items')
| -rw-r--r-- | src/declarative/items/qquickshadereffectsource.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/items/qquickshadereffectsource.cpp b/src/declarative/items/qquickshadereffectsource.cpp index 252c0ba4f3..92e2072fc3 100644 --- a/src/declarative/items/qquickshadereffectsource.cpp +++ b/src/declarative/items/qquickshadereffectsource.cpp @@ -116,6 +116,8 @@ QQuickShaderEffectTexture::QQuickShaderEffectTexture(QQuickItem *shaderSource) QQuickShaderEffectTexture::~QQuickShaderEffectTexture() { + if (m_renderer) + disconnect(m_renderer, SIGNAL(sceneGraphChanged()), this, SLOT(markDirtyTexture())); delete m_renderer; delete m_fbo; delete m_secondaryFbo; |