1 files changed, 19 insertions, 1 deletions
diff --git a/src/quick/items/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h
index cd14008728..f43df691b5 100644
--- a/src/quick/items/qquicktext_p_p.h
+++ b/src/quick/items/qquicktext_p_p.h
@@ -78,7 +78,7 @@ public:
 
     int lineHeightOffset() const;
     QString elidedText(qreal lineWidth, const QTextLine &line, QTextLine *nextLine = 0) const;
-    void elideFormats(int start, int length, int offset, QList<QTextLayout::FormatRange> *elidedFormats);
+    void elideFormats(int start, int length, int offset, QVector<QTextLayout::FormatRange> *elidedFormats);
 
     void processHoverEvent(QHoverEvent *event);
 
@@ -87,6 +87,15 @@ public:
     struct ExtraData {
         ExtraData();
 
+        qreal padding;
+        qreal topPadding;
+        qreal leftPadding;
+        qreal rightPadding;
+        qreal bottomPadding;
+        bool explicitTopPadding : 1;
+        bool explicitLeftPadding : 1;
+        bool explicitRightPadding : 1;
+        bool explicitBottomPadding : 1;
         qreal lineHeight;
         QQuickTextDocumentWithImageResources *doc;
         QString activeLink;
@@ -160,6 +169,15 @@ public:
     qreal getImplicitWidth() const Q_DECL_OVERRIDE;
     qreal getImplicitHeight() const Q_DECL_OVERRIDE;
 
+    qreal availableWidth() const;
+    qreal availableHeight() const;
+
+    inline qreal padding() const { return extra.isAllocated() ? extra->padding : 0.0; }
+    void setTopPadding(qreal value, bool reset = false);
+    void setLeftPadding(qreal value, bool reset = false);
+    void setRightPadding(qreal value, bool reset = false);
+    void setBottomPadding(qreal value, bool reset = false);
+
     void ensureDoc();
 
     QRectF setupTextLayout(qreal * const baseline);