diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2019-02-21 13:04:22 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-02-22 08:42:10 +0000 |
commit | 16aff415a44f5f10c5ac95da72559839305c8ae5 (patch) | |
tree | 4f11a1386344f21928a5a45ff03490081bf65964 /tests/auto/qml/qqmllanguage | |
parent | 1b01a8b809989c873d7b5bd9c213d8866584ec19 (diff) |
Only generate a warning when assigning null to incompatible properties
Such code used to work before and we should not break it without a
proper deprecation procedure.
Change-Id: I049caf6ae5cc06aa796b19eda858612935b8d674
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmllanguage')
3 files changed, 3 insertions, 3 deletions
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; |