diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-11 01:00:36 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-11 01:00:36 +0200 |
| commit | 5d92f1793aa8438ea974cc2232d2aa3b1b2b2472 (patch) | |
| tree | dbb78cdbbf7e03f07d616ab76eb0466c74f7767e /src/gui | |
| parent | 5ae2cbce2c4d5f319f1ddf1895d0f43f1c6ceafe (diff) | |
| parent | 405e297756240b5f14e44b5fbd6a88091d2eddeb (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I1df9adea124326ef7c7802839eb93efc4302b287
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/opengl/qopenglpaintengine.cpp | 1 | ||||
| -rw-r--r-- | src/gui/opengl/qopengltextureglyphcache_p.h | 5 |
2 files changed, 6 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) diff --git a/src/gui/opengl/qopengltextureglyphcache_p.h b/src/gui/opengl/qopengltextureglyphcache_p.h index 0b7b5f6082..598cb00ee5 100644 --- a/src/gui/opengl/qopengltextureglyphcache_p.h +++ b/src/gui/opengl/qopengltextureglyphcache_p.h @@ -152,6 +152,11 @@ public: void clear(); + QOpenGL2PaintEngineExPrivate *paintEnginePrivate() const + { + return pex; + } + private: void setupVertexAttribs(); |