summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qmlbehaviors
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/declarative/qmlbehaviors')
-rw-r--r--tests/auto/declarative/qmlbehaviors/data/binding.qml4
-rw-r--r--tests/auto/declarative/qmlbehaviors/data/color.qml4
-rw-r--r--tests/auto/declarative/qmlbehaviors/data/cpptrigger.qml2
-rw-r--r--tests/auto/declarative/qmlbehaviors/data/disabled.qml2
-rw-r--r--tests/auto/declarative/qmlbehaviors/data/empty.qml2
-rw-r--r--tests/auto/declarative/qmlbehaviors/data/explicit.qml4
-rw-r--r--tests/auto/declarative/qmlbehaviors/data/groupProperty.qml4
-rw-r--r--tests/auto/declarative/qmlbehaviors/data/groupProperty2.qml4
-rw-r--r--tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml2
-rw-r--r--tests/auto/declarative/qmlbehaviors/data/parent.qml2
-rw-r--r--tests/auto/declarative/qmlbehaviors/data/reassignedAnimation.qml2
-rw-r--r--tests/auto/declarative/qmlbehaviors/data/scripttrigger.qml2
-rw-r--r--tests/auto/declarative/qmlbehaviors/data/simple.qml4
-rw-r--r--tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp30
14 files changed, 34 insertions, 34 deletions
diff --git a/tests/auto/declarative/qmlbehaviors/data/binding.qml b/tests/auto/declarative/qmlbehaviors/data/binding.qml
index e0c3321..201da37 100644
--- a/tests/auto/declarative/qmlbehaviors/data/binding.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/binding.qml
@@ -9,9 +9,9 @@ Rectangle {
objectName: "MyRect"
width: 100; height: 100; color: "green"
x: basex
- x: Behavior { NumberAnimation { duration: 200; } }
+ x: Behavior { NumberAnimation { duration: 500; } }
}
- MouseRegion {
+ MouseArea {
id: clicker
anchors.fill: parent
}
diff --git a/tests/auto/declarative/qmlbehaviors/data/color.qml b/tests/auto/declarative/qmlbehaviors/data/color.qml
index 6598703..91dbbd1 100644
--- a/tests/auto/declarative/qmlbehaviors/data/color.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/color.qml
@@ -7,9 +7,9 @@ Rectangle {
objectName: "MyRect"
width: 100; height: 100;
color: "green"
- color: Behavior { ColorAnimation { duration: 200; } }
+ color: Behavior { ColorAnimation { duration: 500; } }
}
- MouseRegion {
+ MouseArea {
id: clicker
anchors.fill: parent
}
diff --git a/tests/auto/declarative/qmlbehaviors/data/cpptrigger.qml b/tests/auto/declarative/qmlbehaviors/data/cpptrigger.qml
index ba507c4..8d032f0 100644
--- a/tests/auto/declarative/qmlbehaviors/data/cpptrigger.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/cpptrigger.qml
@@ -6,6 +6,6 @@ Rectangle {
id: rect
objectName: "MyRect"
width: 100; height: 100; color: "green"
- x: Behavior { NumberAnimation { duration: 200; } }
+ x: Behavior { NumberAnimation { duration: 500; } }
}
}
diff --git a/tests/auto/declarative/qmlbehaviors/data/disabled.qml b/tests/auto/declarative/qmlbehaviors/data/disabled.qml
index e7b8d51..3c7078a 100644
--- a/tests/auto/declarative/qmlbehaviors/data/disabled.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/disabled.qml
@@ -12,7 +12,7 @@ Rectangle {
NumberAnimation { duration: 200; }
}
}
- MouseRegion {
+ MouseArea {
id: clicker
anchors.fill: parent
}
diff --git a/tests/auto/declarative/qmlbehaviors/data/empty.qml b/tests/auto/declarative/qmlbehaviors/data/empty.qml
index 412e26c..95d934a 100644
--- a/tests/auto/declarative/qmlbehaviors/data/empty.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/empty.qml
@@ -8,7 +8,7 @@ Rectangle {
width: 100; height: 100; color: "green"
x: Behavior {}
}
- MouseRegion {
+ MouseArea {
id: clicker
anchors.fill: parent
}
diff --git a/tests/auto/declarative/qmlbehaviors/data/explicit.qml b/tests/auto/declarative/qmlbehaviors/data/explicit.qml
index ba36d93..1b2025a 100644
--- a/tests/auto/declarative/qmlbehaviors/data/explicit.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/explicit.qml
@@ -8,10 +8,10 @@ Rectangle {
width: 100; height: 100; color: "green"
x: Behavior {
objectName: "MyBehavior";
- NumberAnimation { target: rect; property: "x"; duration: 200; }
+ NumberAnimation { target: rect; property: "x"; duration: 500; }
}
}
- MouseRegion {
+ MouseArea {
id: clicker
anchors.fill: parent
}
diff --git a/tests/auto/declarative/qmlbehaviors/data/groupProperty.qml b/tests/auto/declarative/qmlbehaviors/data/groupProperty.qml
index 4f127c1..14883d4 100644
--- a/tests/auto/declarative/qmlbehaviors/data/groupProperty.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/groupProperty.qml
@@ -6,9 +6,9 @@ Rectangle {
id: rect
objectName: "MyRect"
width: 100; height: 100; color: "green"
- pos: Behavior { PropertyAnimation { duration: 200; } }
+ pos: Behavior { PropertyAnimation { duration: 500; } }
}
- MouseRegion {
+ MouseArea {
id: clicker
anchors.fill: parent
}
diff --git a/tests/auto/declarative/qmlbehaviors/data/groupProperty2.qml b/tests/auto/declarative/qmlbehaviors/data/groupProperty2.qml
index 19d70b6..b43ddbc 100644
--- a/tests/auto/declarative/qmlbehaviors/data/groupProperty2.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/groupProperty2.qml
@@ -6,9 +6,9 @@ Rectangle {
id: rect
objectName: "MyRect"
width: 100; height: 100; color: "green"
- pos.x: Behavior { NumberAnimation { duration: 200; } }
+ pos.x: Behavior { NumberAnimation { duration: 500; } }
}
- MouseRegion {
+ MouseArea {
id: clicker
anchors.fill: parent
}
diff --git a/tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml b/tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml
index 59cbd1a..f267a05 100644
--- a/tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml
@@ -11,7 +11,7 @@ Rectangle {
NumberAnimation { targets: rect; properties: "y"; duration: 200; }
}
}
- MouseRegion {
+ MouseArea {
id: clicker
anchors.fill: parent
}
diff --git a/tests/auto/declarative/qmlbehaviors/data/parent.qml b/tests/auto/declarative/qmlbehaviors/data/parent.qml
index 4f4911b..7c7fdcb 100644
--- a/tests/auto/declarative/qmlbehaviors/data/parent.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/parent.qml
@@ -8,7 +8,7 @@ Rectangle {
width: 100; height: 100; color: "green"
parent: Behavior {
SequentialAnimation {
- PauseAnimation { duration: 200 }
+ PauseAnimation { duration: 500 }
PropertyAction {}
}
}
diff --git a/tests/auto/declarative/qmlbehaviors/data/reassignedAnimation.qml b/tests/auto/declarative/qmlbehaviors/data/reassignedAnimation.qml
index 693a595..ba744b1 100644
--- a/tests/auto/declarative/qmlbehaviors/data/reassignedAnimation.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/reassignedAnimation.qml
@@ -12,7 +12,7 @@ Rectangle {
NumberAnimation { duration: 1000 }
}
}
- MouseRegion {
+ MouseArea {
id: clicker
anchors.fill: parent
}
diff --git a/tests/auto/declarative/qmlbehaviors/data/scripttrigger.qml b/tests/auto/declarative/qmlbehaviors/data/scripttrigger.qml
index 4383a0b..a91ca88 100644
--- a/tests/auto/declarative/qmlbehaviors/data/scripttrigger.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/scripttrigger.qml
@@ -11,6 +11,6 @@ Rectangle {
id: rect
objectName: "MyRect"
width: 100; height: 100; color: "green"
- x: Behavior { NumberAnimation { duration: 200; } }
+ x: Behavior { NumberAnimation { duration: 500; } }
}
}
diff --git a/tests/auto/declarative/qmlbehaviors/data/simple.qml b/tests/auto/declarative/qmlbehaviors/data/simple.qml
index 37c3915..ac98ed0 100644
--- a/tests/auto/declarative/qmlbehaviors/data/simple.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/simple.qml
@@ -8,10 +8,10 @@ Rectangle {
width: 100; height: 100; color: "green"
x: Behavior {
objectName: "MyBehavior";
- NumberAnimation { duration: 200; }
+ NumberAnimation { duration: 500; }
}
}
- MouseRegion {
+ MouseArea {
id: clicker
anchors.fill: parent
}
diff --git a/tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp b/tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp
index 99ec728..e31b600 100644
--- a/tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp
+++ b/tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp
@@ -79,7 +79,7 @@ void tst_qmlbehaviors::simpleBehavior()
QVERIFY(qobject_cast<QmlBehavior*>(rect->findChild<QmlBehavior*>("MyBehavior"))->animation());
rect->setState("moved");
- QTest::qWait(100);
+ QTest::qWait(200);
qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
QVERIFY(x > 0 && x < 200); //i.e. the behavior has been triggered
}
@@ -92,7 +92,7 @@ void tst_qmlbehaviors::scriptTriggered()
QVERIFY(rect);
rect->setColor(QColor("red"));
- QTest::qWait(100);
+ QTest::qWait(200);
qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
QVERIFY(x > 0 && x < 200); //i.e. the behavior has been triggered
}
@@ -108,7 +108,7 @@ void tst_qmlbehaviors::cppTriggered()
QVERIFY(innerRect);
innerRect->setProperty("x", 200);
- QTest::qWait(100);
+ QTest::qWait(200);
qreal x = innerRect->x();
QVERIFY(x > 0 && x < 200); //i.e. the behavior has been triggered
}
@@ -132,7 +132,7 @@ void tst_qmlbehaviors::colorBehavior()
QVERIFY(rect);
rect->setState("red");
- QTest::qWait(100);
+ QTest::qWait(200);
QColor color = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->color();
QVERIFY(color != QColor("red") && color != QColor("green")); //i.e. the behavior has been triggered
}
@@ -145,11 +145,11 @@ void tst_qmlbehaviors::parentBehavior()
QVERIFY(rect);
rect->setState("reparented");
- QTest::qWait(100);
+ QTest::qWait(200);
QmlGraphicsItem *newParent = rect->findChild<QmlGraphicsItem*>("NewParent");
QmlGraphicsItem *parent = rect->findChild<QmlGraphicsRectangle*>("MyRect")->parentItem();
QVERIFY(parent != newParent);
- QTest::qWait(300);
+ QTest::qWait(600);
parent = rect->findChild<QmlGraphicsRectangle*>("MyRect")->parentItem();
QVERIFY(parent == newParent);
}
@@ -162,29 +162,29 @@ void tst_qmlbehaviors::replaceBinding()
QVERIFY(rect);
rect->setState("moved");
- QTest::qWait(100);
+ QTest::qWait(200);
QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
QVERIFY(innerRect);
qreal x = innerRect->x();
QVERIFY(x > 0 && x < 200); //i.e. the behavior has been triggered
- QTest::qWait(300);
+ QTest::qWait(600);
QCOMPARE(innerRect->x(), (qreal)200);
rect->setProperty("basex", 10);
QCOMPARE(innerRect->x(), (qreal)200);
rect->setProperty("movedx", 210);
- QTest::qWait(300);
+ QTest::qWait(600);
QCOMPARE(innerRect->x(), (qreal)210);
rect->setState("");
- QTest::qWait(100);
+ QTest::qWait(200);
x = innerRect->x();
QVERIFY(x > 10 && x < 210); //i.e. the behavior has been triggered
- QTest::qWait(300);
+ QTest::qWait(600);
QCOMPARE(innerRect->x(), (qreal)10);
rect->setProperty("movedx", 200);
QCOMPARE(innerRect->x(), (qreal)10);
rect->setProperty("basex", 20);
- QTest::qWait(300);
+ QTest::qWait(600);
QCOMPARE(innerRect->x(), (qreal)20);
}
@@ -197,7 +197,7 @@ void tst_qmlbehaviors::group()
QVERIFY(rect);
rect->setState("moved");
- QTest::qWait(100);
+ QTest::qWait(200);
qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
QVERIFY(x > 0 && x < 200); //i.e. the behavior has been triggered
}
@@ -209,7 +209,7 @@ void tst_qmlbehaviors::group()
QVERIFY(rect);
rect->setState("moved");
- QTest::qWait(100);
+ QTest::qWait(200);
qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
QVERIFY(x > 0 && x < 200); //i.e. the behavior has been triggered
}
@@ -236,7 +236,7 @@ void tst_qmlbehaviors::explicitSelection()
QVERIFY(rect);
rect->setState("moved");
- QTest::qWait(100);
+ QTest::qWait(200);
qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
QVERIFY(x > 0 && x < 200); //i.e. the behavior has been triggered
}