diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-05-12 07:42:52 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-05-12 07:42:52 (GMT) |
| commit | 731a2f16578ead0f75f2752e757b138376b2f872 (patch) | |
| tree | 2b6f9746771992f97cbdb5cf5af8f35ac6928b26 /tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml | |
| parent | 37475bcc4aef3f08c5917f22c7f0f427e4214b91 (diff) | |
| parent | b4c589868f278aa9a58ab9afa727dbf0a9442e22 (diff) | |
| download | Qt-731a2f16578ead0f75f2752e757b138376b2f872.zip Qt-731a2f16578ead0f75f2752e757b138376b2f872.tar.gz Qt-731a2f16578ead0f75f2752e757b138376b2f872.tar.bz2 | |
Merge remote branch 'mainline/4.7' into 4.7
Conflicts:
src/declarative/qml/qdeclarativeengine.cpp
tools/qdoc3/htmlgenerator.cpp
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml')
| -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 } } |