diff options
author | Liang Qi <liang.qi@qt.io> | 2018-09-10 09:11:00 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-09-10 12:12:46 +0200 |
commit | 683e144efbd91163795dc582aedc210c7d78de4d (patch) | |
tree | 2211fffdbaad8bad9569f63e017e7caf85eec2b6 /src/gui/opengl/qopenglpaintengine.cpp | |
parent | b66357e3ebf3e3dbda04f880e87184e247882843 (diff) | |
parent | 1f1e2aa57b480f0b227e11d0cff0b3cfcffb1f39 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
mkspecs/common/macx.conf
Change-Id: I8576493b417912fa5e5501bc2c1b935d186ac209
Diffstat (limited to 'src/gui/opengl/qopenglpaintengine.cpp')
-rw-r--r-- | src/gui/opengl/qopenglpaintengine.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp index 3680b3c3c2..001cb839fa 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp @@ -1817,6 +1817,7 @@ void QOpenGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngine::GlyphFormat gly // we may have to re-bind brush textures after filling in the cache. brushTextureDirty = (QT_BRUSH_TEXTURE_UNIT == glypchCacheTextureUnit); } + cache->setPaintEnginePrivate(nullptr); } if (cache->width() == 0 || cache->height() == 0) |