Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

11 files changed, 145 insertions, 132 deletions

diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 6939290..97fced4 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -381,7 +381,7 @@ void tst_qdeclarativeecmascript::basicExpressions()
     nestedContext.setContextProperty("millipedeLegs", QVariant(100));
 
     MyExpression expr(nest?&nestedContext:&context, expression);
-    QCOMPARE(expr.value(), result);
+    QCOMPARE(expr.evaluate(), result);
 }
 
 void tst_qdeclarativeecmascript::arrayExpressions()
@@ -396,7 +396,7 @@ void tst_qdeclarativeecmascript::arrayExpressions()
     context.setContextProperty("c", &obj3);
 
     MyExpression expr(&context, "[a, b, c, 10]");
-    QVariant result = expr.value();
+    QVariant result = expr.evaluate();
     QCOMPARE(result.userType(), qMetaTypeId<QList<QObject *> >());
     QList<QObject *> list = qvariant_cast<QList<QObject *> >(result);
     QCOMPARE(list.count(), 4);
@@ -424,47 +424,47 @@ void tst_qdeclarativeecmascript::contextPropertiesTriggerReeval()
     { 
         MyExpression expr(&context, "testProp + 1");
         QCOMPARE(expr.changed, false);
-        QCOMPARE(expr.value(), QVariant(2));
+        QCOMPARE(expr.evaluate(), QVariant(2));
 
         context.setContextProperty("testProp", QVariant(2));
         QCOMPARE(expr.changed, true);
-        QCOMPARE(expr.value(), QVariant(3));
+        QCOMPARE(expr.evaluate(), QVariant(3));
     }
 
     { 
         MyExpression expr(&context, "testProp + testProp + testProp");
         QCOMPARE(expr.changed, false);
-        QCOMPARE(expr.value(), QVariant(6));
+        QCOMPARE(expr.evaluate(), QVariant(6));
 
         context.setContextProperty("testProp", QVariant(4));
         QCOMPARE(expr.changed, true);
-        QCOMPARE(expr.value(), QVariant(12));
+        QCOMPARE(expr.evaluate(), QVariant(12));
     }
 
     { 
         MyExpression expr(&context, "testObj.stringProperty");
         QCOMPARE(expr.changed, false);
-        QCOMPARE(expr.value(), QVariant("Hello"));
+        QCOMPARE(expr.evaluate(), QVariant("Hello"));
 
         context.setContextProperty("testObj", &object2);
         QCOMPARE(expr.changed, true);
-        QCOMPARE(expr.value(), QVariant("World"));
+        QCOMPARE(expr.evaluate(), QVariant("World"));
     }
 
     { 
         MyExpression expr(&context, "testObj.stringProperty /**/");
         QCOMPARE(expr.changed, false);
-        QCOMPARE(expr.value(), QVariant("World"));
+        QCOMPARE(expr.evaluate(), QVariant("World"));
 
         context.setContextProperty("testObj", &object1);
         QCOMPARE(expr.changed, true);
-        QCOMPARE(expr.value(), QVariant("Hello"));
+        QCOMPARE(expr.evaluate(), QVariant("Hello"));
     }
 
     { 
         MyExpression expr(&context, "testObj2");
         QCOMPARE(expr.changed, false);
-        QCOMPARE(expr.value(), QVariant::fromValue((QObject *)object3));
+        QCOMPARE(expr.evaluate(), QVariant::fromValue((QObject *)object3));
     }
 
 }
@@ -484,42 +484,42 @@ void tst_qdeclarativeecmascript::objectPropertiesTriggerReeval()
     { 
         MyExpression expr(&context, "testObj.stringProperty");
         QCOMPARE(expr.changed, false);
-        QCOMPARE(expr.value(), QVariant("Hello"));
+        QCOMPARE(expr.evaluate(), QVariant("Hello"));
 
         object1.setStringProperty(QLatin1String("World"));
         QCOMPARE(expr.changed, true);
-        QCOMPARE(expr.value(), QVariant("World"));
+        QCOMPARE(expr.evaluate(), QVariant("World"));
     }
 
     { 
         MyExpression expr(&context, "testObj.objectProperty.stringProperty");
         QCOMPARE(expr.changed, false);
-        QCOMPARE(expr.value(), QVariant());
+        QCOMPARE(expr.evaluate(), QVariant());
 
         object1.setObjectProperty(&object2);
         QCOMPARE(expr.changed, true);
         expr.changed = false;
-        QCOMPARE(expr.value(), QVariant("Dog"));
+        QCOMPARE(expr.evaluate(), QVariant("Dog"));
 
         object1.setObjectProperty(&object3);
         QCOMPARE(expr.changed, true);
         expr.changed = false;
-        QCOMPARE(expr.value(), QVariant("Cat"));
+        QCOMPARE(expr.evaluate(), QVariant("Cat"));
 
         object1.setObjectProperty(0);
         QCOMPARE(expr.changed, true);
         expr.changed = false;
-        QCOMPARE(expr.value(), QVariant());
+        QCOMPARE(expr.evaluate(), QVariant());
 
         object1.setObjectProperty(&object3);
         QCOMPARE(expr.changed, true);
         expr.changed = false;
-        QCOMPARE(expr.value(), QVariant("Cat"));
+        QCOMPARE(expr.evaluate(), QVariant("Cat"));
 
         object3.setStringProperty("Donkey");
         QCOMPARE(expr.changed, true);
         expr.changed = false;
-        QCOMPARE(expr.value(), QVariant("Donkey"));
+        QCOMPARE(expr.evaluate(), QVariant("Donkey"));
     }
 }
 
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index 73aefaf..e0143a6 100644
--- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -401,7 +401,7 @@ T *tst_qdeclarativeimage::findItem(QGraphicsObject *parent, const QString &objec
         if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
             if (index != -1) {
                 QDeclarativeExpression e(qmlContext(item), "index", item);
-                if (e.value().toInt() == index)
+                if (e.evaluate().toInt() == index)
                     return static_cast<T*>(item);
             } else {
                 return static_cast<T*>(item);
diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index e4c296f..ec97461 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -279,7 +279,7 @@ void tst_qdeclarativelistmodel::dynamic()
     if (!warning.isEmpty())
         QTest::ignoreMessage(QtWarningMsg, warning.toLatin1());
 
-    int actual = e.value().toInt();
+    int actual = e.evaluate().toInt();
     if (e.hasError())
         qDebug() << e.error(); // errors not expected
     QVERIFY(!e.hasError());
@@ -338,9 +338,9 @@ void tst_qdeclarativelistmodel::dynamic_worker()
 
         QDeclarativeExpression e(eng.rootContext(), operations.last().toString(), &model);
         if (QByteArray(QTest::currentDataTag()).startsWith("nested"))
-            QVERIFY(e.value().toInt() != result);
+            QVERIFY(e.evaluate().toInt() != result);
         else
-            QCOMPARE(e.value().toInt(), result);
+            QCOMPARE(e.evaluate().toInt(), result);
     }
 
     delete item;
diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
index 6b7a361..cab4d52 100644
--- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
+++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -1551,7 +1551,7 @@ T *tst_QDeclarativeListView::findItem(QGraphicsObject *parent, const QString &ob
         if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
             if (index != -1) {
                 QDeclarativeExpression e(qmlContext(item), "index", item);
-                if (e.value().toInt() == index)
+                if (e.evaluate().toInt() == index)
                     return static_cast<T*>(item);
             } else {
                 return static_cast<T*>(item);
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
index df7c511..0e3a74d 100644
--- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -697,7 +697,7 @@ T *tst_QDeclarativePathView::findItem(QGraphicsObject *parent, const QString &ob
         if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
             if (index != -1) {
                 QDeclarativeExpression e(qmlContext(item), "index", item);
-                if (e.value().toInt() == index)
+                if (e.evaluate().toInt() == index)
                     return static_cast<T*>(item);
             } else {
                 return static_cast<T*>(item);
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.0.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.0.png
index 80cbd26..bb9dfbb 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml
index a4036fe..b293d70 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml
@@ -6,334 +6,334 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 32
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 48
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 64
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 80
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 96
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 112
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 128
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 144
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 160
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 176
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 192
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 208
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 224
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 240
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 256
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 272
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 288
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 304
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 320
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 336
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 352
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 368
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 384
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 400
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 416
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 432
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 448
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 464
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 480
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 496
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 512
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+        hash: "b72bfb206ae52e0e4fb8927b82d64b64"
     }
     Frame {
         msec: 528
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 544
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 560
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 576
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 592
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 608
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 624
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 640
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 656
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 672
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 688
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 704
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 720
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 736
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 752
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 768
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 784
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 800
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 816
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 832
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 848
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 864
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 880
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 896
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 912
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 928
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 944
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 960
-        image: "repeater.0.png"
+        image: "usingRepeater.0.png"
     }
     Frame {
         msec: 976
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 992
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1008
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1024
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1040
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1056
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1072
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1088
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1104
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1120
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1136
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1152
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1168
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1184
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1200
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1216
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1232
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1248
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1264
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1280
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1296
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1312
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
     Frame {
         msec: 1328
-        hash: "53a01771047c8ec806a335a1a3d6af71"
+        hash: "f2de1f70c5f242604beb4ee0251c8032"
     }
 }
diff --git a/tests/auto/qdiriterator/tst_qdiriterator.cpp b/tests/auto/qdiriterator/tst_qdiriterator.cpp
index c1db8f2..1a873b8 100644
--- a/tests/auto/qdiriterator/tst_qdiriterator.cpp
+++ b/tests/auto/qdiriterator/tst_qdiriterator.cpp
@@ -85,11 +85,13 @@ private: // convenience functions
         return false;
     }
 
-    bool createFile(const QString &fileName)
+    enum Cleanup { DoDelete, DontDelete };
+    bool createFile(const QString &fileName, Cleanup cleanup = DoDelete)
     {
         QFile file(fileName);
         if (file.open(QIODevice::WriteOnly)) {
-            createdFiles << fileName;
+            if (cleanup == DoDelete)
+                createdFiles << fileName;
             return true;
         }
         return false;
@@ -131,9 +133,9 @@ tst_QDirIterator::tst_QDirIterator()
 
     createDirectory("entrylist");
     createDirectory("entrylist/directory");
-    createFile("entrylist/file");
+    createFile("entrylist/file", DontDelete);
     createFile("entrylist/writable");
-    createFile("entrylist/directory/dummy");
+    createFile("entrylist/directory/dummy", DontDelete);
 
     createDirectory("recursiveDirs");
     createDirectory("recursiveDirs/dir1");
diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp
index 4282062..c336746 100644
--- a/tests/auto/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp
@@ -128,6 +128,7 @@ private slots:
     void threadSafety();
 
     void multipleSameLookups();
+    void multipleDifferentLookups_data();
     void multipleDifferentLookups();
 
     void cache();
@@ -441,36 +442,46 @@ void tst_QHostInfo::multipleSameLookups()
     for (int i = 0; i < COUNT; i++)
         QHostInfo::lookupHost("localhost", this, SLOT(resultsReady(const QHostInfo)));
 
-    QTRY_VERIFY(lookupsDoneCounter == COUNT);
-
-    // spin two seconds more to see if it is not more :)
-    QTestEventLoop::instance().enterLoop(2);
-    QTRY_VERIFY(lookupsDoneCounter == COUNT);
+    QElapsedTimer timer;
+    timer.start();
+    while (timer.elapsed() < 10000 && lookupsDoneCounter < COUNT) {
+        QTestEventLoop::instance().enterLoop(2);
+    }
+    QCOMPARE(lookupsDoneCounter, COUNT);
 }
 
 // this test is for the multi-threaded QHostInfo rewrite. It is about getting results at all,
 // not about getting correct IPs
+void tst_QHostInfo::multipleDifferentLookups_data()
+{
+    QTest::addColumn<int>("repeats");
+    QTest::newRow("1") << 1;
+    QTest::newRow("2") << 2;
+    QTest::newRow("5") << 5;
+    QTest::newRow("10") << 10;
+}
+
 void tst_QHostInfo::multipleDifferentLookups()
 {
     QStringList hostnameList;
     hostnameList << "www.ovi.com" << "www.nokia.com" << "qt.nokia.com" << "www.trolltech.com" << "troll.no"
-            << "www.qtcentre.org" << "forum.nokia.com" << "www.forum.nokia.com" << "wiki.forum.nokia.com"
-            << "www.nokia.no" << "nokia.de" << "127.0.0.1" << "----";
+            << "www.qtcentre.org" << "forum.nokia.com" << "www.nokia.com" << "wiki.forum.nokia.com"
+            << "www.nokia.com" << "nokia.de" << "127.0.0.1" << "----";
 
+    QFETCH(int, repeats);
     const int COUNT = hostnameList.size();
     lookupsDoneCounter = 0;
 
     for (int i = 0; i < hostnameList.size(); i++)
-        QHostInfo::lookupHost(hostnameList.at(i), this, SLOT(resultsReady(const QHostInfo)));
-
-    // give some time
-    QTestEventLoop::instance().enterLoop(5);
-    // try_verify gives some more time
-    QTRY_VERIFY(lookupsDoneCounter == COUNT);
+        for (int j = 0; j < repeats; ++j)
+            QHostInfo::lookupHost(hostnameList.at(i), this, SLOT(resultsReady(const QHostInfo)));
 
-    // spin two seconds more to see if it is not more than expected
-    QTestEventLoop::instance().enterLoop(2);
-    QTRY_VERIFY(lookupsDoneCounter == COUNT);
+    QElapsedTimer timer;
+    timer.start();
+    while (timer.elapsed() < 10000 && lookupsDoneCounter < repeats*COUNT) {
+        QTestEventLoop::instance().enterLoop(2);
+    }
+    QCOMPARE(lookupsDoneCounter, repeats*COUNT);
 }
 
 void tst_QHostInfo::cache()
@@ -517,7 +528,7 @@ void tst_QHostInfo::resultsReady(const QHostInfo &hi)
     lookupDone = true;
     lookupResults = hi;
     lookupsDoneCounter++;
-    QTestEventLoop::instance().exitLoop();
+    QMetaObject::invokeMethod(&QTestEventLoop::instance(), "exitLoop", Qt::QueuedConnection);
 }
 
 QTEST_MAIN(tst_QHostInfo)
diff --git a/tests/auto/qitemmodel/tst_qitemmodel.cpp b/tests/auto/qitemmodel/tst_qitemmodel.cpp
index f466045..d36df9c 100644
--- a/tests/auto/qitemmodel/tst_qitemmodel.cpp
+++ b/tests/auto/qitemmodel/tst_qitemmodel.cpp
@@ -452,7 +452,7 @@ void checkChildren(QAbstractItemModel *currentModel, const QModelIndex &parent,
             QCOMPARE(index.column(), c);
             QCOMPARE(currentModel->data(index, Qt::DisplayRole).isValid(), true);
 
-            // If the next test fails here is some somewhat usefull debug you play with.
+            // If the next test fails here is some somewhat useful debug you play with.
             /*
             if (currentModel->parent(index) != parent) {
                 qDebug() << r << c << currentDepth << currentModel->data(index).toString()
diff --git a/tests/auto/qthread/tst_qthread.cpp b/tests/auto/qthread/tst_qthread.cpp
index 9a4397e..7a5b053 100644
--- a/tests/auto/qthread/tst_qthread.cpp
+++ b/tests/auto/qthread/tst_qthread.cpp
@@ -442,9 +442,9 @@ void tst_QThread::exit()
     thread2.object = 0;
     thread2.code = 53;
     thread2.result = 0;
+    QMutexLocker locker2(&thread2.mutex);
     thread2.start();
     thread2.exit(thread2.code);
-    QMutexLocker locker2(&thread2.mutex);
     thread2.cond.wait(locker2.mutex());
     QVERIFY(thread2.wait(five_minutes));
     QCOMPARE(thread2.result, thread2.code);
@@ -514,9 +514,9 @@ void tst_QThread::quit()
     Quit_Thread thread2;
     thread2.object = 0;
     thread2.result = -1;
+    QMutexLocker locker2(&thread2.mutex);
     thread2.start();
     thread2.quit();
-    QMutexLocker locker2(&thread2.mutex);
     thread2.cond.wait(locker2.mutex());
     QVERIFY(thread2.wait(five_minutes));
     QCOMPARE(thread2.result, 0);