diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-23 01:00:50 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-02-25 09:20:43 +0100 |
| commit | a1aee495c8a69a076d3981ef005c627d74bb3660 (patch) | |
| tree | 3fac2d8c217caf57f4faf0ead448126d44a28a51 /tests/auto/qml/qqmllanguage | |
| parent | b15654d77f7886ae23f06d760b90973983e12779 (diff) | |
| parent | 3baa2d550512702dfc227aef0af3542ab189824f (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/qml/qqmlmetatype.cpp
Change-Id: I517c001ea4eb0fdd8e469f9fffe5b7559a5b0795
Diffstat (limited to 'tests/auto/qml/qqmllanguage')
4 files changed, 5 insertions, 15 deletions
diff --git a/tests/auto/qml/qqmllanguage/data/SignalEmitter.qml b/tests/auto/qml/qqmllanguage/data/SignalEmitter.qml index 31fe5e4a5e..259f45b7d2 100644 --- a/tests/auto/qml/qqmllanguage/data/SignalEmitter.qml +++ b/tests/auto/qml/qqmllanguage/data/SignalEmitter.qml @@ -10,18 +10,8 @@ QtObject { signal testSignal(SignalParam spp); function emitTestSignal() { - 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 = true; + testSignal(op); testObject.expectNull = false; testSignal(p); diff --git a/tests/auto/qml/qqmllanguage/data/objectDeletionNotify.1.qml b/tests/auto/qml/qqmllanguage/data/objectDeletionNotify.1.qml index ac5622f9fb..acd5463a3c 100644 --- a/tests/auto/qml/qqmllanguage/data/objectDeletionNotify.1.qml +++ b/tests/auto/qml/qqmllanguage/data/objectDeletionNotify.1.qml @@ -10,7 +10,7 @@ Item { } } - property bool expectNull: { return null; } + property bool expectNull: null function setExpectNull(b) { success = false; diff --git a/tests/auto/qml/qqmllanguage/data/objectDeletionNotify.2.qml b/tests/auto/qml/qqmllanguage/data/objectDeletionNotify.2.qml index 3c18739c32..ed0e0d10f0 100644 --- a/tests/auto/qml/qqmllanguage/data/objectDeletionNotify.2.qml +++ b/tests/auto/qml/qqmllanguage/data/objectDeletionNotify.2.qml @@ -10,7 +10,7 @@ Item { } } - property bool expectNull: { return null; } + property bool expectNull: null function setExpectNull(b) { success = false; diff --git a/tests/auto/qml/qqmllanguage/data/objectDeletionNotify.3.qml b/tests/auto/qml/qqmllanguage/data/objectDeletionNotify.3.qml index e2e560199f..f5e94ba715 100644 --- a/tests/auto/qml/qqmllanguage/data/objectDeletionNotify.3.qml +++ b/tests/auto/qml/qqmllanguage/data/objectDeletionNotify.3.qml @@ -10,7 +10,7 @@ Item { } } - property bool expectNull: { return null; } + property bool expectNull: null function setExpectNull(b) { success = false; |