Fix potential crash when using text and more than 1 QQuickView
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Mon, 6 Aug 2012 09:51:09 +0000 (11:51 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 28 Sep 2012 14:15:31 +0000 (16:15 +0200)
commite03363dfd1aeddd085c4c86d9a1964da769d7980
tree9bffd1443a010a418e306cdd06642df7f3f48cbf
parent5bd0e08063fcacba0c2b63528712968c7d74e7f9
Fix potential crash when using text and more than 1 QQuickView

We need to use a resource guard for the FBO in case there is no
current context when the glyph cache is deleted.

This reverts commit b3264e2cb6a8fe87754aa1335ab9f8d5e3910c14 which
was implemented as a band-aid for this crash.

Change-Id: I5b3a09a3998da38836ea851cd0978d3ddadcd2cc
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h
tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp