diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-21 01:00:50 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-21 01:00:50 +0100 |
| commit | 573afc9fdd093724dd58f818b965f42fca8bd1a8 (patch) | |
| tree | c1d743037b6887fa6d0df99e1ecd89f8da61788b /tests/auto/qml/qqmllanguage | |
| parent | 7d80264fa7fc71bc68ed091ff8ba97bdd7970dc4 (diff) | |
| parent | 03097d5038fe6331df97182a38fac3a9a84fe195 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ie33d1c736992abcbde6568131374a7a7891f965c
Diffstat (limited to 'tests/auto/qml/qqmllanguage')
| -rw-r--r-- | tests/auto/qml/qqmllanguage/data/SignalEmitter.qml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tests/auto/qml/qqmllanguage/data/SignalEmitter.qml b/tests/auto/qml/qqmllanguage/data/SignalEmitter.qml index 259f45b7d2..31fe5e4a5e 100644 --- a/tests/auto/qml/qqmllanguage/data/SignalEmitter.qml +++ b/tests/auto/qml/qqmllanguage/data/SignalEmitter.qml @@ -10,8 +10,18 @@ QtObject { signal testSignal(SignalParam spp); function emitTestSignal() { - testObject.expectNull = true; - testSignal(op); + var caught = false; + try { + testObject.expectNull = true; + testSignal(op); + } catch(e) { + // good: We want a type error here + caught = true; + if (handleSignal) + testObject.determineSuccess(null); + } + if (!caught && handleSignal) + testObject.determineSuccess("fail"); testObject.expectNull = false; testSignal(p); |