summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-04-19 06:25:26 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-04-19 06:26:31 (GMT)
commitfae16b674b619b73037841a00577de5922a26595 (patch)
treea58b1f7b79c6d24f5d328efb6b9c427daac4b30a /tests/auto
parentd2f8eaca50b9997bd66805787b5042faa28f5ec2 (diff)
downloadQt-fae16b674b619b73037841a00577de5922a26595.zip
Qt-fae16b674b619b73037841a00577de5922a26595.tar.gz
Qt-fae16b674b619b73037841a00577de5922a26595.tar.bz2
Don't crash on deleted objects assigned to variant properties
QTBUG-8077
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
index 29eba42..64b83af 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
@@ -20,6 +20,6 @@ QtObject {
myObject.deleteOnSet = 1;
test3 = myObject.value == undefined;
- // test4 = obj.value == undefined;
+ test4 = obj.value == undefined;
}
}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index a94f4f6..4036507 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -1764,7 +1764,6 @@ void tst_qdeclarativeecmascript::deletedObject()
QCOMPARE(object->property("test1").toBool(), true);
QCOMPARE(object->property("test2").toBool(), true);
QCOMPARE(object->property("test3").toBool(), true);
- QEXPECT_FAIL("", "QTBUG-8077", Continue);
QCOMPARE(object->property("test4").toBool(), true);
delete object;