summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-06-03 18:54:40 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-04 10:03:36 +0200
commit8db84cb14a049ff27ccc5893517d8c5ffe0fd636 (patch)
tree0479c9cc776b3d95795b6c6e286c78d7dd9bed85
parent4051e69852cd648942e03cd36e14c2c34124c19f (diff)
downloadqtquickcontrols-8db84cb14a049ff27ccc5893517d8c5ffe0fd636.tar.gz
TextArea: allow declaring child elements inline
Change-Id: I7da8e3664d6bd3ee9a8c4f22d4a5b686d1c5b5a9 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
-rw-r--r--src/controls/TextArea.qml3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml
index cbef6e31..4771fcb0 100644
--- a/src/controls/TextArea.qml
+++ b/src/controls/TextArea.qml
@@ -609,6 +609,9 @@ ScrollView {
property alias backgroundColor: colorRect.color
/*! \internal */
+ default property alias data: area.data
+
+ /*! \internal */
property int __documentMargin: 4
frameVisible: true