diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-20 01:00:04 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-20 01:00:04 +0100 |
| commit | 03097d5038fe6331df97182a38fac3a9a84fe195 (patch) | |
| tree | 928675991970423a6b06a8bcf5aeb79b43d2710e /tests/auto/qml/qqmllanguage/data | |
| parent | fee0fcfef08a05ed4ba9369d2352c876b514d69c (diff) | |
| parent | 407e2769c7b7909fdb2979090e71fa636f109a04 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I69c3e6610ff590d9c18f386fc17ed2e429b58d26
Diffstat (limited to 'tests/auto/qml/qqmllanguage/data')
| -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); |