aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/controls/data/tst_textarea.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-10-29 22:25:11 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-10-30 09:51:36 +0000
commit19e7cc53a7189c5c35a478d06b435433297771c5 (patch)
treea1b1958cdaf36813b362b943acc4a55ba5294b27 /tests/auto/controls/data/tst_textarea.qml
parent390fb0d4a8e4f308b225a86b48205b14633cf0e2 (diff)
Simplify TextField & TextArea placeholder
Better not expose the extra Text item in the API. Ideally it should be implemented as a scenegraph node. We might even want to promote the placeholderText property (and add placeholderColor) to TextInput and TextEdit in Qt Quick core. Change-Id: I4f443c77d1c696b87a50ee184f868713dd50316f Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'tests/auto/controls/data/tst_textarea.qml')
-rw-r--r--tests/auto/controls/data/tst_textarea.qml10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml
index 1c31f435..286a32ce 100644
--- a/tests/auto/controls/data/tst_textarea.qml
+++ b/tests/auto/controls/data/tst_textarea.qml
@@ -89,11 +89,17 @@ TestCase {
control.horizontalAlignment = TextArea.AlignRight
compare(control.horizontalAlignment, TextArea.AlignRight)
- compare(control.placeholder.horizontalAlignment, Text.AlignRight)
+ for (var i = 0; i < control.children.length; ++i) {
+ if (control.children[i].hasOwnProperty("horizontalAlignment"))
+ compare(control.children[i].horizontalAlignment, Text.AlignRight) // placeholder
+ }
control.verticalAlignment = TextArea.AlignBottom
compare(control.verticalAlignment, TextArea.AlignBottom)
- compare(control.placeholder.verticalAlignment, Text.AlignBottom)
+ for (var j = 0; j < control.children.length; ++j) {
+ if (control.children[j].hasOwnProperty("verticalAlignment"))
+ compare(control.children[j].verticalAlignment, Text.AlignBottom) // placeholder
+ }
control.destroy()
}