diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2017-07-24 13:53:58 +0200 |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2017-07-24 12:00:48 +0000 |
commit | a51e7963e9a5b2a35c982e77f636ac4ca9a8cbc4 (patch) | |
tree | 274b16cd42ff9bb870a247bdbe454f4545c9b18e /src/quick/scenegraph/qsgdefaultrendercontext_p.h | |
parent | 9dc9424d1873b1bc3b5ed056d4dda7f6c76e15ae (diff) |
Ensure same glyph cache is used for same font at different sizes
This was fixed in Qt 5.9.0 by 9921b48c83490b450241d6c172f1375ab4efb6b1,
but refactoring caused this change to be lost.
This is just porting the fix to the refactored class hierarchy.
Task-number: QTBUG-60696
Change-Id: I4f95cc7bdd49580ae623a03a7f9cc5242599b6c2
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
Diffstat (limited to 'src/quick/scenegraph/qsgdefaultrendercontext_p.h')
-rw-r--r-- | src/quick/scenegraph/qsgdefaultrendercontext_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/scenegraph/qsgdefaultrendercontext_p.h b/src/quick/scenegraph/qsgdefaultrendercontext_p.h index 0aed46b658..2537a06988 100644 --- a/src/quick/scenegraph/qsgdefaultrendercontext_p.h +++ b/src/quick/scenegraph/qsgdefaultrendercontext_p.h @@ -96,6 +96,8 @@ public: int maxTextureSize() const override { return m_maxTextureSize; } protected: + static QString fontKey(const QRawFont &font); + QOpenGLContext *m_gl; QSGDepthStencilBufferManager *m_depthStencilManager; int m_maxTextureSize; |