summaryrefslogtreecommitdiff
path: root/src/controls/TextArea.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2014-04-15 15:51:25 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-15 17:53:44 +0200
commit1faf36d6ab733e798fbc9acc463a512c345cab5a (patch)
tree98d556c3d23f2b545ab0223494bd2c1b1b492163 /src/controls/TextArea.qml
parent955c8d6deaa04f4541c935c39a9273e7f6e47546 (diff)
downloadqtquickcontrols-1faf36d6ab733e798fbc9acc463a512c345cab5a.tar.gz
Add missing TextArea::contentWidth and contentHeight
Task-number: QTBUG-38324 Change-Id: I6cd5cab164288434e589d2b5e8c5cbfbb9bbea90 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls/TextArea.qml')
-rw-r--r--src/controls/TextArea.qml14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml
index 4b22dded..48627da0 100644
--- a/src/controls/TextArea.qml
+++ b/src/controls/TextArea.qml
@@ -642,6 +642,20 @@ ScrollView {
*/
property alias textMargin: edit.textMargin
+ /*! \qmlproperty real TextArea::contentWidth
+ \since QtQuick.Controls 1.3
+
+ The width of the text content.
+ */
+ readonly property alias contentWidth: edit.contentWidth
+
+ /*! \qmlproperty real TextArea::contentHeight
+ \since QtQuick.Controls 1.3
+
+ The height of the text content.
+ */
+ readonly property alias contentHeight: edit.contentHeight
+
frameVisible: true
activeFocusOnTab: true