diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-04-01 15:22:28 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-04-01 15:24:22 +0300 |
| commit | 9aa02769f69ecf5f1204494efd1686af7160baef (patch) | |
| tree | 9ed57808b60a8fcd35aede63a957009bb4a9eed4 /src/runtime/q3dsdistancefieldglyphcache.cpp | |
| parent | 22203c3521bc0213226c0c01d8782f0d0656da1e (diff) | |
| parent | 5e0bfe934b9930b7e41d457b4f88fce91342a0ea (diff) | |
Merge branch '2.3'
Change-Id: I45789a62b7e94717257a1a9ef7030124fbee69c3
Diffstat (limited to 'src/runtime/q3dsdistancefieldglyphcache.cpp')
| -rw-r--r-- | src/runtime/q3dsdistancefieldglyphcache.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/runtime/q3dsdistancefieldglyphcache.cpp b/src/runtime/q3dsdistancefieldglyphcache.cpp index 6086917..a6e5477 100644 --- a/src/runtime/q3dsdistancefieldglyphcache.cpp +++ b/src/runtime/q3dsdistancefieldglyphcache.cpp @@ -248,6 +248,11 @@ void Q3DSDistanceFieldGlyphCache::storeGlyphs(const QList<QDistanceField> &glyph } } +qreal Q3DSDistanceFieldGlyphCache::fontSize() const +{ + return QT_DISTANCEFIELD_BASEFONTSIZE(m_doubleGlyphResolution); +} + void Q3DSDistanceFieldGlyphCache::requestGlyphs(const QSet<glyph_t> &glyphs) { // Note: Most of this is copy-pasted from QSGDefaultDistanceFieldGlyphCache in Qt Quick. |