diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-07 11:57:42 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-07 06:36:05 +0100 |
| commit | 51b7425329e0fa221c319e8d75595c19f664aedb (patch) | |
| tree | 48c2d03edc05da74296a25540f1b8df52389b7ee /src/quick/items/qquicktextedit_p_p.h | |
| parent | ce3dee765c858a0b573d468ef8fee6b838e576d1 (diff) | |
Add contentWidth and contentHeight properties to Text elements.
For Text and TextEdit this is a rename of paintedWidth and paintedHeight
both of which remain as synonyms of the content properties for
compatability. For TextInput this is a new property.
Task-number: QTBUG-23691
Task-number: QTBUG-15160
Change-Id: Idbdc72fad34922be21b649ca45fc39b5e533ed1a
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktextedit_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktextedit_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h index 41b64cc567..ead74a282f 100644 --- a/src/quick/items/qquicktextedit_p_p.h +++ b/src/quick/items/qquicktextedit_p_p.h @@ -133,7 +133,7 @@ public: QQuickTextEdit::SelectionMode mouseSelectionMode; int lineCount; int yoff; - QSize paintedSize; + QSize contentSize; enum NodeType { NodeIsNull, |