diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-18 03:01:00 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-18 03:01:00 +0200 |
| commit | 9f94115e5207863e1a8ef35b59ceef50ae1dabce (patch) | |
| tree | 40047bdec39438354d34a7b3660d59fa9816a250 /tests | |
| parent | e8c619517ba1f75224c61334f67ae165d704b184 (diff) | |
| parent | e7213c0460788f49ec6c2204bfd5c0517699aa51 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Ic5311418d3f25398380c4a32b35753329efb6f3f
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/controls/data/tst_popup.qml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml index 3106b22f..962feae2 100644 --- a/tests/auto/controls/data/tst_popup.qml +++ b/tests/auto/controls/data/tst_popup.qml @@ -1371,6 +1371,9 @@ TestCase { var window = createTemporaryObject(shortcutWindowComponent, testCase) var control = window.popup + window.requestActivate() + tryCompare(window, "active", true) + var shortcutActivatedSpy = createTemporaryObject(signalSpy, testCase, { target: window.shortcut, signalName: "activated"} ) verify(shortcutActivatedSpy.valid) |