diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-05-05 18:56:41 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-05-05 18:56:41 (GMT) |
| commit | 57c6b39a72e037fe50cda7005cea79d1c4dcd888 (patch) | |
| tree | 1c594add8e5b8598322d2cd88a537e965738cac0 /tests/auto/declarative/qdeclarativeecmascript/data | |
| parent | 0a8379d9f01118d7ff0121e6ecbbc0307e1e7f63 (diff) | |
| parent | d340dc6e4b3f1f4f8737d0d1d34e76ae68e007d6 (diff) | |
| download | Qt-57c6b39a72e037fe50cda7005cea79d1c4dcd888.zip Qt-57c6b39a72e037fe50cda7005cea79d1c4dcd888.tar.gz Qt-57c6b39a72e037fe50cda7005cea79d1c4dcd888.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/data')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml index 72b59ae..2337e44 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml @@ -19,7 +19,7 @@ QtObject { myObject.deleteOnSet = 1; - test3 = myObject.value == undefined; - test4 = obj.value == undefined; + test3 = myObject == null + test4 = obj == null } } |