Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14

1 files changed, 7 insertions, 0 deletions

diff --git a/src/gui/text/qglyphrun_p.h b/src/gui/text/qglyphrun_p.h
index c9554d0d6d..d18d7129f9 100644
--- a/src/gui/text/qglyphrun_p.h
+++ b/src/gui/text/qglyphrun_p.h
@@ -63,6 +63,8 @@ public:
         , glyphIndexDataSize(0)
         , glyphPositionData(glyphPositions.constData())
         , glyphPositionDataSize(0)
+        , textRangeStart(-1)
+        , textRangeEnd(-1)
     {
     }
 
@@ -77,6 +79,8 @@ public:
       , glyphIndexDataSize(other.glyphIndexDataSize)
       , glyphPositionData(other.glyphPositionData)
       , glyphPositionDataSize(other.glyphPositionDataSize)
+      , textRangeStart(other.textRangeStart)
+      , textRangeEnd(other.textRangeEnd)
     {
     }
 
@@ -93,6 +97,9 @@ public:
     const QPointF *glyphPositionData;
     int glyphPositionDataSize;
 
+    int textRangeStart;
+    int textRangeEnd;
+
     static QGlyphRunPrivate *get(const QGlyphRun &glyphRun)
     {
         return glyphRun.d.data();