From 8d3a376d7d468fcc16fcbf6b98f9301a68ae7d2b Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Wed, 10 Feb 2010 16:00:27 +1000 Subject: Fix tests --- tests/auto/declarative/qmllanguage/data/invalidID.5.errors.txt | 2 +- tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.5.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidID.5.errors.txt index b0a63a0..c167de3 100644 --- a/tests/auto/declarative/qmllanguage/data/invalidID.5.errors.txt +++ b/tests/auto/declarative/qmllanguage/data/invalidID.5.errors.txt @@ -1 +1 @@ -4:9:id conflicts with namespace prefix +2:20:Invalid import qualifier ID diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp index 357fc5f..3029501 100644 --- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp +++ b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp @@ -327,6 +327,9 @@ void tst_qmllanguage::errors() QFETCH(QString, errorFile); QFETCH(bool, create); + if (file == "invalidID.6.qml") + QSKIP("Test disabled until we strictly disallow ids from beginning with uppercase letters", SkipSingle); + QmlComponent component(&engine, TEST_FILE(file)); if(create) { -- cgit v0.12 From a221b2d7980932d09c20f215ad1dc56531ae7bf1 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Wed, 10 Feb 2010 16:06:10 +1000 Subject: Crash --- src/declarative/qml/qmlengine.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 81988ed..372821e 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -542,6 +542,8 @@ void QmlEngine::setContextForObject(QObject *object, QmlContext *context) data->context = context; data->nextContextObject = context->d_func()->contextObjects; + if (data->nextContextObject) + data->nextContextObject->prevContextObject = &data->nextContextObject; data->prevContextObject = &context->d_func()->contextObjects; context->d_func()->contextObjects = data; } -- cgit v0.12 From 46595f3a20e9d1d8483172bdd27d17652c4d302e Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Wed, 10 Feb 2010 16:26:30 +1000 Subject: Test --- .../declarative/qmlecmascript/tst_qmlecmascript.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp index 1ba9a52..2182ff4 100644 --- a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp +++ b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp @@ -120,6 +120,7 @@ private slots: void undefinedResetsProperty(); void listToVariant(); void multiEngineObject(); + void deletedObject(); void bug1(); @@ -1637,6 +1638,22 @@ void tst_qmlecmascript::multiEngineObject() delete o1; } +// Test that references to QObjects are cleanup when the object is destroyed +void tst_qmlecmascript::deletedObject() +{ + QmlComponent component(&engine, TEST_FILE("deletedObject.qml")); + + QObject *object = component.create(); + + 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; +} + QTEST_MAIN(tst_qmlecmascript) #include "tst_qmlecmascript.moc" -- cgit v0.12