diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-02 17:28:05 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-02 17:28:16 +0200 |
| commit | fba02cc8ae7fb71abb927a06a8e480f7909dc029 (patch) | |
| tree | d32e2c1f0070ab49fc85cdc89b744f9925b4e614 /tests/auto/controls/data/tst_popup.qml | |
| parent | f6c3ecdb0646a4d83be5c07dd5369d0b0350260c (diff) | |
| parent | 33904b63ce9971efc3763a0048a084ec3324dfc4 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I82da1e547c4ead1181ade19f77c62651c00998a3
Diffstat (limited to 'tests/auto/controls/data/tst_popup.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_popup.qml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml index 759d6988..52c24c86 100644 --- a/tests/auto/controls/data/tst_popup.qml +++ b/tests/auto/controls/data/tst_popup.qml @@ -1159,17 +1159,23 @@ TestCase { tryCompare(window.plainPopup, "visible", true) compare(window.overlay.children.length, countBefore + 1) // only popup added, no overlays involved + window.plainPopup.modal = true + compare(window.overlay.children.length, countBefore + 2) // overlay added + window.plainPopup.close() tryCompare(window.plainPopup, "visible", false) - compare(window.overlay.children.length, countBefore) // only popup removed, no overlays involved + compare(window.overlay.children.length, countBefore) // popup + overlay removed window.modalPopupWithoutDim.open() tryCompare(window.modalPopupWithoutDim, "visible", true) compare(window.overlay.children.length, countBefore + 1) // only popup added, no overlays involved + window.modalPopupWithoutDim.dim = true + compare(window.overlay.children.length, countBefore + 2) // overlay added + window.modalPopupWithoutDim.close() tryCompare(window.modalPopupWithoutDim, "visible", false) - compare(window.overlay.children.length, countBefore) // only popup added, no overlays involved + compare(window.overlay.children.length, countBefore) // popup + overlay removed window.destroy() } |