diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-11 14:03:47 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-11 14:03:47 +0200 |
commit | c32c776bf4bd0bc601cb78f9814036cb40b33b52 (patch) | |
tree | a390a1b5909c0396271be5f29b818ba114328e70 /tests/auto/controls/data | |
parent | 4997773a6ed0ea9908cd67ab0335d2ae177a6320 (diff) | |
parent | d3aef722da533c3b100ba653498c79986a44c9f9 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quicktemplates2/qquicklabel.cpp
src/quicktemplates2/qquicktextarea.cpp
src/quicktemplates2/qquicktextfield.cpp
Change-Id: Ibbf6bc48972f58fbc6779a87ac9e2434c56c4db8
Diffstat (limited to 'tests/auto/controls/data')
-rw-r--r-- | tests/auto/controls/data/tst_spinbox.qml | 6 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_textarea.qml | 16 |
2 files changed, 22 insertions, 0 deletions
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml index 54b81453..003468a1 100644 --- a/tests/auto/controls/data/tst_spinbox.qml +++ b/tests/auto/controls/data/tst_spinbox.qml @@ -559,4 +559,10 @@ TestCase { mouseRelease(control.up.indicator, -1, -1) verify(!control.up.pressed) } + + function test_initialValue() { + var control = createTemporaryObject(spinBox, testCase, {from: 1000, to: 10000}) + verify(control) + compare(control.value, 1000) + } } diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml index 0b68edc9..7c47aa25 100644 --- a/tests/auto/controls/data/tst_textarea.qml +++ b/tests/auto/controls/data/tst_textarea.qml @@ -449,4 +449,20 @@ TestCase { mouseClick(control, rect.x + rect.width / 2, rect.y + rect.height / 2) compare(control.selectedText, "Qt Quick Controls 2 TextArea") } + + Component { + id: scrollView + ScrollView { + TextArea { } + } + } + + function test_scrollView() { + var control = createTemporaryObject(scrollView, testCase) + verify(control) + + // don't crash (QTBUG-62292) + control.destroy() + wait(0) + } } |