diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-23 09:58:37 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-23 09:58:37 +0200 |
| commit | 9884ce9ff65e12d92244d3201b8226503354ae07 (patch) | |
| tree | f0434a169f7d7401507713977f3c91a3b10918d5 /tests/auto/controls/data/tst_stackview.qml | |
| parent | 56cb695c43321ef2c0052f60485db192dfb72225 (diff) | |
| parent | 817372c771910d017735ecdd8d4af03a016e2ba9 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/quicktemplates2/qquickstackview.cpp
tests/auto/controls/data/tst_stackview.qml
Change-Id: I9ff4854be8f3c4a0ab943199ae475f3352147965
Diffstat (limited to 'tests/auto/controls/data/tst_stackview.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_stackview.qml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml index 2f66cfc0..77929a0a 100644 --- a/tests/auto/controls/data/tst_stackview.qml +++ b/tests/auto/controls/data/tst_stackview.qml @@ -221,28 +221,41 @@ TestCase { function test_depth() { var control = createTemporaryObject(stackView, testCase) verify(control) + var depthSpy = signalSpy.createObject(control, {target: control, signalName: "depthChanged"}) + verify(depthSpy.valid) compare(control.depth, 0) compare(control.empty, true) control.push(item, StackView.Immediate) compare(control.depth, 1) + compare(depthSpy.count, 1) compare(control.empty, false) control.clear() compare(control.depth, 0) + compare(depthSpy.count, 2) compare(control.empty, true) control.push(component, StackView.Immediate) compare(control.depth, 1) + compare(depthSpy.count, 3) compare(control.empty, false) control.push(component, StackView.Immediate) compare(control.depth, 2) + compare(depthSpy.count, 4) compare(control.empty, false) control.pop(StackView.Immediate) compare(control.depth, 1) + compare(depthSpy.count, 5) compare(control.empty, false) control.pop(StackView.Immediate) // ignored compare(control.depth, 1) + compare(depthSpy.count, 5) compare(control.empty, false) control.clear() compare(control.depth, 0) + compare(depthSpy.count, 6) + compare(control.empty, true) + control.clear() + compare(control.depth, 0) + compare(depthSpy.count, 6) compare(control.empty, true) } |