diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-05 15:31:08 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-06 10:11:04 +0200 |
| commit | af44559780765c7121a49c2e0764cf24e740312d (patch) | |
| tree | a4f2f50ddfe969f33a4d4accd392523c6809fd5a /tests/auto/quick/qquickpositioners | |
| parent | 8784a4a46ea1357bde546c9a1c88bd060e863f30 (diff) | |
| parent | b30d7c9ee8fbc3a395c74b618f2ab176ae1e7f7e (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/qml/debugger/qv8debugservice.cpp
src/qml/qml/v8/qv8engine.cpp
tests/auto/quick/qquickitem/qquickitem.pro
Change-Id: Ic4a1dcdd8b8a84155d2f2abefdf1da5c3a56af31
Diffstat (limited to 'tests/auto/quick/qquickpositioners')
| -rw-r--r-- | tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp index 1f472a3f46..69008486c4 100644 --- a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp +++ b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp @@ -655,10 +655,13 @@ void tst_qquickpositioners::addTransitions(const QString &positionerObjectName) QQmlContext *ctxt = window->rootContext(); ctxt->setContextProperty("usePopulateTransition", QVariant(false)); ctxt->setContextProperty("enableAddTransition", QVariant(true)); + ctxt->setContextProperty("dynamicallyPopulate", QVariant(false)); + ctxt->setContextProperty("testModel", &model); ctxt->setContextProperty("model_targetItems_transitionFrom", &model_targetItems_transitionFrom); ctxt->setContextProperty("model_displacedItems_transitionVia", &model_displacedItems_transitionVia); ctxt->setContextProperty("targetItems_transitionFrom", targetItems_transitionFrom); ctxt->setContextProperty("displacedItems_transitionVia", displacedItems_transitionVia); + ctxt->setContextProperty("testedPositioner", QString()); window->setSource(testFileUrl("transitions.qml")); window->show(); QTest::qWaitForWindowExposed(window.data()); @@ -767,10 +770,13 @@ void tst_qquickpositioners::moveTransitions(const QString &positionerObjectName) QQmlContext *ctxt = window->rootContext(); ctxt->setContextProperty("usePopulateTransition", QVariant(false)); ctxt->setContextProperty("enableAddTransition", QVariant(false)); + ctxt->setContextProperty("dynamicallyPopulate", QVariant(false)); + ctxt->setContextProperty("testModel", &model); ctxt->setContextProperty("model_targetItems_transitionFrom", &model_targetItems_transitionFrom); ctxt->setContextProperty("model_displacedItems_transitionVia", &model_displacedItems_transitionVia); ctxt->setContextProperty("targetItems_transitionFrom", targetItems_transitionFrom); ctxt->setContextProperty("displacedItems_transitionVia", displacedItems_transitionVia); + ctxt->setContextProperty("testedPositioner", QString()); window->setSource(testFileUrl("transitions.qml")); window->show(); QTest::qWaitForWindowExposed(window.data()); |