Add contentWidth and contentHeight properties to Text elements.
authorAndrew den Exter <andrew.den-exter@nokia.com>
Tue, 7 Feb 2012 01:57:42 +0000 (11:57 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 7 Feb 2012 05:36:05 +0000 (06:36 +0100)
commit51b7425329e0fa221c319e8d75595c19f664aedb
tree48c2d03edc05da74296a25540f1b8df52389b7ee
parentce3dee765c858a0b573d468ef8fee6b838e576d1
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>
src/quick/items/qquicktext.cpp
src/quick/items/qquicktext_p.h
src/quick/items/qquicktext_p_p.h
src/quick/items/qquicktextedit.cpp
src/quick/items/qquicktextedit_p.h
src/quick/items/qquicktextedit_p_p.h
src/quick/items/qquicktextinput.cpp
src/quick/items/qquicktextinput_p.h
tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp
tests/auto/qtquick2/qquicktextedit/tst_qquicktextedit.cpp
tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp