aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-06-24 11:26:22 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-06-24 11:48:46 +0200
commit1a9759855639b9e2b3cdc0687d3381dcbf6c9815 (patch)
treeb2da51f6eddddb83c2d97cdcfac24d38d2e67a4e /tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
parent8217ec1b888f3ff93f004801b018c5f85362c484 (diff)
parente1fc2793aef53b84a3f1e19b6d6bdf1141340074 (diff)
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into wip/v4
Conflicts: src/imports/qtquick2/plugins.qmltypes src/qml/debugger/qv8debugservice.cpp src/qml/qml/qml.pri src/qml/qml/qqmlcompiler.cpp src/qml/qml/qqmlcomponent.cpp src/qml/qml/qqmlcontext.cpp src/qml/qml/qqmldata_p.h src/qml/qml/qqmlengine_p.h src/qml/qml/qqmljavascriptexpression.cpp src/qml/qml/qqmlxmlhttprequest.cpp src/qml/qml/v4/qv4bindings.cpp src/qml/qml/v4/qv4irbuilder.cpp src/qml/qml/v4/qv4jsonobject_p.h src/qml/qml/v8/qqmlbuiltinfunctions.cpp src/qml/qml/v8/qv8bindings.cpp src/qml/qml/v8/qv8contextwrapper.cpp src/qml/qml/v8/qv8listwrapper.cpp src/qml/qml/v8/qv8qobjectwrapper.cpp src/qml/qml/v8/qv8qobjectwrapper_p.h src/qml/qml/v8/qv8sequencewrapper_p_p.h src/qml/qml/v8/qv8typewrapper.cpp src/qml/qml/v8/qv8valuetypewrapper.cpp src/qml/types/qqmldelegatemodel.cpp src/quick/items/context2d/qquickcanvasitem.cpp src/quick/items/context2d/qquickcontext2d.cpp sync.profile tests/auto/qml/qjsengine/tst_qjsengine.cpp tests/benchmarks/qml/animation/animation.pro tools/qmlprofiler/qmlprofiler.pro Change-Id: I18a76b8a81d87523247fa03a44ca334b1a2360c9
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp')
-rw-r--r--tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp32
1 files changed, 32 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index dcf72f9dc0..cb1b0b3212 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -89,6 +89,7 @@ private slots:
void objectPropertiesTriggerReeval();
void deferredProperties();
void deferredPropertiesErrors();
+ void deferredPropertiesInComponents();
void extensionObjects();
void overrideExtensionProperties();
void attachedProperties();
@@ -863,6 +864,37 @@ void tst_qqmlecmascript::deferredPropertiesErrors()
delete object;
}
+void tst_qqmlecmascript::deferredPropertiesInComponents()
+{
+ // Test that it works when the property is set inside and outside component
+ QQmlComponent component(&engine, testFileUrl("deferredPropertiesInComponents.qml"));
+ QObject *object = component.create();
+ if (!object)
+ qDebug() << component.errorString();
+ QVERIFY(object != 0);
+ QCOMPARE(object->property("value").value<int>(), 10);
+
+ MyDeferredObject *defObjectA =
+ qobject_cast<MyDeferredObject *>(object->property("deferredInside").value<QObject*>());
+ QVERIFY(defObjectA != 0);
+ QVERIFY(defObjectA->objectProperty() == 0);
+
+ qmlExecuteDeferred(defObjectA);
+ QVERIFY(defObjectA->objectProperty() != 0);
+ QCOMPARE(defObjectA->objectProperty()->property("value").value<int>(), 10);
+
+ MyDeferredObject *defObjectB =
+ qobject_cast<MyDeferredObject *>(object->property("deferredOutside").value<QObject*>());
+ QVERIFY(defObjectB != 0);
+ QVERIFY(defObjectB->objectProperty() == 0);
+
+ qmlExecuteDeferred(defObjectB);
+ QVERIFY(defObjectB->objectProperty() != 0);
+ QCOMPARE(defObjectB->objectProperty()->property("value").value<int>(), 10);
+
+ delete object;
+}
+
void tst_qqmlecmascript::extensionObjects()
{
QQmlComponent component(&engine, testFileUrl("extensionObjects.qml"));