diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-17 23:08:00 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-18 22:11:24 +0200 |
commit | d9aae9ff99d20b58487b0a48801864d13115363b (patch) | |
tree | e98089900164f7a1008e6fb59d1815dc9eab8d2c /tests/auto/controls/data/tst_rangemodel.qml | |
parent | 49bd4b76d08ec11d08105ca71e8dda4f8d459b5c (diff) | |
parent | c2356328f88b044c8956fe7860c4c04fca4f2c30 (diff) | |
download | qtquickcontrols-d9aae9ff99d20b58487b0a48801864d13115363b.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/controls/Private/qquickrangemodel.cpp
src/controls/Private/qquickrangemodel_p.h
src/controls/Private/qquickrangemodel_p_p.h
src/layouts/qquicklayout.cpp
tests/auto/controls/data/tst_rangemodel.qml
Change-Id: I9c8f6326c6edf9ebb18dd538f76830e1b439ba8e
Diffstat (limited to 'tests/auto/controls/data/tst_rangemodel.qml')
-rw-r--r-- | tests/auto/controls/data/tst_rangemodel.qml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/controls/data/tst_rangemodel.qml b/tests/auto/controls/data/tst_rangemodel.qml index f489e4b5..fd0a8dbe 100644 --- a/tests/auto/controls/data/tst_rangemodel.qml +++ b/tests/auto/controls/data/tst_rangemodel.qml @@ -78,6 +78,14 @@ TestCase { spy.clear() } + function test_delayedinit() { + var component = Qt.createComponent("rangemodel/init.qml"); + compare(component.status, Component.Ready) + var r = component.createObject(testCase, {minimumValue: 40, maximumValue: 90, value: 80}); + compare(r.value, 80) + compare(r.spy.count, 1) + } + function test_setminimumvalue() { spy.signalName = "minimumChanged" compare(spy.count, 0) |