Merge pull request #8862 from zzmp/fix/quick-leak

fix leak from qml surfaces' render controls
This commit is contained in:
Brad Hefta-Gaub 2016-10-20 08:23:28 -07:00 committed by GitHub
commit 4a6101060c

View file

@ -122,7 +122,9 @@ void OffscreenQmlSurface::setupFbo() {
void OffscreenQmlSurface::cleanup() {
_canvas->makeCurrent();
_renderControl->invalidate();
delete _renderControl; // and invalidate
if (_depthStencil) {
glDeleteRenderbuffers(1, &_depthStencil);
_depthStencil = 0;
@ -237,7 +239,6 @@ OffscreenQmlSurface::~OffscreenQmlSurface() {
QObject::disconnect(&_updateTimer);
QObject::disconnect(qApp);
cleanup();
_canvas->deleteLater();