summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-10-22 15:23:56 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-23 20:53:25 +0200
commit860dd2acb930d87a4a7ec47cdd8bca9d7a113c77 (patch)
treed3f96ac68872a37fce9dd81bb79f0625baeb18ed /tests
parentfb99780dbae5b5f1bc972db83f612e9d3fafa75a (diff)
downloadqtquickcontrols-860dd2acb930d87a4a7ec47cdd8bca9d7a113c77.tar.gz
Add TextAreaStyle
Task-number: QTBUG-33266 Change-Id: I7bcd45469e757f7bde25b62e2324833b85a0ee7f Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/controls/data/tst_styles.qml7
-rw-r--r--tests/manual/testbench/content/Components.qml2
2 files changed, 8 insertions, 1 deletions
diff --git a/tests/auto/controls/data/tst_styles.qml b/tests/auto/controls/data/tst_styles.qml
index 126c84a7..a458a78d 100644
--- a/tests/auto/controls/data/tst_styles.qml
+++ b/tests/auto/controls/data/tst_styles.qml
@@ -157,5 +157,12 @@ Item {
Rectangle { width: 50; height: 50; property Component style: TabViewStyle {}}'
, container, '')
}
+
+ function test_createTextAreaStyle() {
+ var control = Qt.createQmlObject(
+ 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
+ Rectangle { width: 50; height: 50; property Component style: TextAreaStyle {}}'
+ , container, '')
+ }
}
}
diff --git a/tests/manual/testbench/content/Components.qml b/tests/manual/testbench/content/Components.qml
index 059a1f16..98642aff 100644
--- a/tests/manual/testbench/content/Components.qml
+++ b/tests/manual/testbench/content/Components.qml
@@ -143,7 +143,7 @@ Item {
property Component sliderStyle: SliderStyle {}
property Component progressbarStyle: ProgressBarStyle {}
property Component textfieldStyle: TextFieldStyle {}
- property Component textareaStyle: null
+ property Component textareaStyle: TextAreaStyle {}
property Component spinboxStyle: SpinBoxStyle {}
property Component toolbarStyle: ToolBarStyle {}
property Component statusbarStyle: StatusBarStyle {}