Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/qml/jit/qv4targetplatform_p.h
	src/quick/accessible/qaccessiblequickitem_p.h

Change-Id: Ic95075a5fad81ec997a61561bd65979dfa3b9d4d

1 files changed, 8 insertions, 4 deletions

diff --git a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
index 1fc63db1b2..b28ca7725a 100644
--- a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
+++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
@@ -103,8 +103,10 @@ void QSGDefaultDistanceFieldGlyphCache::requestGlyphs(const QSet<glyph_t> &glyph
         glyph_t glyphIndex = *it;
 
         int padding = QSG_DEFAULT_DISTANCEFIELD_GLYPH_CACHE_PADDING;
-        int glyphWidth = qCeil(glyphData(glyphIndex).boundingRect.width()) + distanceFieldRadius() * 2;
-        QSize glyphSize(glyphWidth + padding * 2, QT_DISTANCEFIELD_TILESIZE(doubleGlyphResolution()) + padding * 2);
+        QRectF boundingRect = glyphData(glyphIndex).boundingRect;
+        int glyphWidth = qCeil(boundingRect.width()) + distanceFieldRadius() * 2;
+        int glyphHeight = qCeil(boundingRect.height()) + distanceFieldRadius() * 2;
+        QSize glyphSize(glyphWidth + padding * 2, glyphHeight + padding * 2);
         QRect alloc = m_areaAllocator->allocate(glyphSize);
 
         if (alloc.isNull()) {
@@ -113,11 +115,13 @@ void QSGDefaultDistanceFieldGlyphCache::requestGlyphs(const QSet<glyph_t> &glyph
                 glyph_t unusedGlyph = *m_unusedGlyphs.constBegin();
 
                 TexCoord unusedCoord = glyphTexCoord(unusedGlyph);
-                int unusedGlyphWidth = qCeil(glyphData(unusedGlyph).boundingRect.width()) + distanceFieldRadius() * 2;
+                QRectF unusedGlyphBoundingRect = glyphData(unusedGlyph).boundingRect;
+                int unusedGlyphWidth = qCeil(unusedGlyphBoundingRect.width()) + distanceFieldRadius() * 2;
+                int unusedGlyphHeight = qCeil(unusedGlyphBoundingRect.height())  + distanceFieldRadius() * 2;
                 m_areaAllocator->deallocate(QRect(unusedCoord.x - padding,
                                                   unusedCoord.y - padding,
                                                   padding * 2 + unusedGlyphWidth,
-                                                  padding * 2 + QT_DISTANCEFIELD_TILESIZE(doubleGlyphResolution())));
+                                                  padding * 2 + unusedGlyphHeight));
 
                 m_unusedGlyphs.remove(unusedGlyph);
                 m_glyphsTexture.remove(unusedGlyph);