diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-06 09:12:42 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-06 09:13:13 +0200 |
| commit | 0e90e0d2c385d8928d188314ed16d70050b362eb (patch) | |
| tree | 26a55cc9382b9dd0c047aedd529cac248088d492 /src/quick/items/qquickrendercontrol.cpp | |
| parent | 68af8842f5f580dab140f397cfd5683ebdc368cf (diff) | |
| parent | 60da655dff4ffcc94d32a05bb5fa32240b0eaa0b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Id98d3514e602a3c8c159a27be7b2fd24d7d290ae
Diffstat (limited to 'src/quick/items/qquickrendercontrol.cpp')
| -rw-r--r-- | src/quick/items/qquickrendercontrol.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp index 2594cc7f14..8ac002ed2c 100644 --- a/src/quick/items/qquickrendercontrol.cpp +++ b/src/quick/items/qquickrendercontrol.cpp @@ -57,6 +57,8 @@ #include <QtQuick/private/qquickwindow_p.h> #include <QtCore/private/qobject_p.h> +#include <private/qquickshadereffectnode_p.h> + QT_BEGIN_NAMESPACE #ifndef QT_NO_OPENGL extern Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format, bool include_alpha); @@ -184,6 +186,8 @@ void QQuickRenderControlPrivate::windowDestroyed() delete QQuickWindowPrivate::get(window)->animationController; QQuickWindowPrivate::get(window)->animationController = 0; + QQuickShaderEffectMaterial::cleanupMaterialCache(); + window = 0; } } |