aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickpositioners
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-06-13 12:10:18 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-20 17:22:31 +0200
commit58f3f50c43f021ebfe214062562498d02b6f2071 (patch)
tree17e02ef27ee8d0e76eaf25f800836121b4c9b85e /tests/auto/quick/qquickpositioners
parente884e15615dc97c95704835756680b9c38be29ea (diff)
Fix warnings in declarative tests.
- Unused variables and test data. - () around operator &&. - Conversion of false to 0-pointer where QVariant was intended. - Missing enumeration value. - Remove duplicated qqmlecmascript entry from qml.pro (has an internal check for no-widgets). Change-Id: Ie030167e22bce26e3988a4406c630fb460f61a3c Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickpositioners')
-rw-r--r--tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
index 920db000ab..1b7adbecda 100644
--- a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
+++ b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
@@ -660,8 +660,8 @@ void tst_qquickpositioners::addTransitions(const QString &positionerObjectName)
QQuickView *canvas = QQuickViewTestUtil::createView();
QQmlContext *ctxt = canvas->rootContext();
- ctxt->setContextProperty("usePopulateTransition", false);
- ctxt->setContextProperty("enableAddTransition", true);
+ ctxt->setContextProperty("usePopulateTransition", QVariant(false));
+ ctxt->setContextProperty("enableAddTransition", QVariant(true));
ctxt->setContextProperty("model_targetItems_transitionFrom", &model_targetItems_transitionFrom);
ctxt->setContextProperty("model_displacedItems_transitionVia", &model_displacedItems_transitionVia);
ctxt->setContextProperty("targetItems_transitionFrom", targetItems_transitionFrom);
@@ -773,7 +773,7 @@ void tst_qquickpositioners::moveTransitions(const QString &positionerObjectName)
QQuickView *canvas = QQuickViewTestUtil::createView();
QQmlContext *ctxt = canvas->rootContext();
- ctxt->setContextProperty("usePopulateTransition", false);
+ ctxt->setContextProperty("usePopulateTransition", QVariant(false));
ctxt->setContextProperty("enableAddTransition", QVariant(false));
ctxt->setContextProperty("model_targetItems_transitionFrom", &model_targetItems_transitionFrom);
ctxt->setContextProperty("model_displacedItems_transitionVia", &model_displacedItems_transitionVia);
@@ -804,6 +804,8 @@ void tst_qquickpositioners::moveTransitions(const QString &positionerObjectName)
case ListChange::SetContentY:
QVERIFY(false);
break;
+ case ListChange::Polish:
+ break;
}
QTRY_COMPARE(canvas->rootObject()->property("displaceTransitionsDone").toInt(), expectedDisplacedIndexes.count());