diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:13:01 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:13:02 +0200 |
| commit | 1f1e2aa57b480f0b227e11d0cff0b3cfcffb1f39 (patch) | |
| tree | 9d5a045b3fea13486cf6108fd9ef641f3a1f5135 /src/gui | |
| parent | 3bac18da8ef9f5750207ddf47192b5db3137c4ac (diff) | |
| parent | 9da5b6f7432dc1d87cec94040ede69cb2f7ff537 (diff) | |
Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: I2fa26fa061cbf5d2bded203a299a19b7d1c31d0a
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 3d1c362275..6a89089f18 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp @@ -1741,6 +1741,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(); |