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

19 files changed, 50 insertions, 323 deletions

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 3d2dbf0..daffdef 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -52,7 +52,6 @@ SUBDIRS += \
            qdeclarativeqt \
            qdeclarativerepeater \
            qdeclarativesmoothedanimation \
-           qdeclarativesmoothedfollow\
            qdeclarativespringfollow \
            qdeclarativesqldatabase \
            qdeclarativestates \
diff --git a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
index 13960b1..5028ba1 100644
--- a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
+++ b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
@@ -279,7 +279,7 @@ void tst_qdeclarativedom::loadComposite()
 void tst_qdeclarativedom::testValueSource()
 {
     QByteArray qml = "import Qt 4.7\n"
-                     "Rectangle { SpringFollow on height { spring: 1.4; damping: .15; to: Math.min(Math.max(-130, value*2.2 - 130), 133); }}";
+                     "Rectangle { SpringAnimation on height { spring: 1.4; damping: .15; to: Math.min(Math.max(-130, value*2.2 - 130), 133); }}";
 
     QDeclarativeEngine freshEngine;
     QDeclarativeDomDocument document;
@@ -295,7 +295,7 @@ void tst_qdeclarativedom::testValueSource()
     QDeclarativeDomObject valueSourceObject = valueSource.object();
     QVERIFY(valueSourceObject.isValid());
 
-    QVERIFY(valueSourceObject.objectType() == "Qt/SpringFollow");
+    QVERIFY(valueSourceObject.objectType() == "Qt/SpringAnimation");
 
     const QDeclarativeDomValue springValue = valueSourceObject.property("spring").value();
     QVERIFY(!springValue.isInvalid());
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index df029f5..38fd458 100644
--- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -88,7 +88,6 @@ private slots:
     void resized();
     void preserveAspectRatio();
     void smooth();
-    void pixmap();
     void svg();
     void big();
     void tiling_QTBUG_6716();
@@ -261,36 +260,6 @@ void tst_qdeclarativeimage::smooth()
     delete obj;
 }
 
-void tst_qdeclarativeimage::pixmap()
-{
-    QString componentStr = "import Qt 4.7\nImage { pixmap: testPixmap }";
-
-    QPixmap pixmap;
-    QDeclarativeContext *ctxt = engine.rootContext();
-    ctxt->setContextProperty("testPixmap", pixmap);
-
-    QDeclarativeComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-
-    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->source(), QUrl());
-    QVERIFY(obj->status() == QDeclarativeImage::Null);
-    QCOMPARE(obj->width(), 0.);
-    QCOMPARE(obj->height(), 0.);
-    QCOMPARE(obj->fillMode(), QDeclarativeImage::Stretch);
-    QCOMPARE(obj->progress(), 0.0);
-    QVERIFY(obj->pixmap().isNull());
-
-    pixmap = QPixmap(SRCDIR "/data/colors.png");
-    ctxt->setContextProperty("testPixmap", pixmap);
-    QCOMPARE(obj->width(), 120.);
-    QCOMPARE(obj->height(), 120.);
-    QVERIFY(obj->status() == QDeclarativeImage::Ready);
-
-    delete obj;
-}
-
 void tst_qdeclarativeimage::svg()
 {
     QString src = QUrl::fromLocalFile(SRCDIR "/data/heart.svg").toString();
diff --git a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
index 9d62f22..e0b46f0 100644
--- a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
+++ b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
@@ -256,9 +256,7 @@ void tst_qdeclarativeimageprovider::requestPixmap_async()
     engine.addImageProvider("test", provider);
     QVERIFY(engine.imageProvider("test") != 0);
 
-    QTest::ignoreMessage(QtWarningMsg,
-        "Pixmaps must be loaded synchronously, ignoring asynchronous property for Image with source: \"image://test/pixmap-async-test.png\"");
-
+    // pixmaps are loaded synchronously regardless of 'asynchronous' value
     QString componentStr = "import Qt 4.7\nImage { asynchronous: true; source: \"image://test/pixmap-async-test.png\" }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
diff --git a/tests/auto/declarative/qdeclarativesmoothedfollow/data/smoothedfollow1.qml b/tests/auto/declarative/qdeclarativesmoothedfollow/data/smoothedfollow1.qml
deleted file mode 100644
index 8c9d8ad..0000000
--- a/tests/auto/declarative/qdeclarativesmoothedfollow/data/smoothedfollow1.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import Qt 4.7
-
-SmoothedFollow {}
diff --git a/tests/auto/declarative/qdeclarativesmoothedfollow/data/smoothedfollow2.qml b/tests/auto/declarative/qdeclarativesmoothedfollow/data/smoothedfollow2.qml
deleted file mode 100644
index a634302..0000000
--- a/tests/auto/declarative/qdeclarativesmoothedfollow/data/smoothedfollow2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.7
-
-SmoothedFollow {
-    to: 10; duration: 300; reversingMode: SmoothedFollow.Immediate
-}
diff --git a/tests/auto/declarative/qdeclarativesmoothedfollow/data/smoothedfollow3.qml b/tests/auto/declarative/qdeclarativesmoothedfollow/data/smoothedfollow3.qml
deleted file mode 100644
index c60da7f..0000000
--- a/tests/auto/declarative/qdeclarativesmoothedfollow/data/smoothedfollow3.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.7
-
-SmoothedFollow {
-    to: 10; velocity: 250; reversingMode: SmoothedFollow.Sync
-    maximumEasingTime: 150
-}
diff --git a/tests/auto/declarative/qdeclarativesmoothedfollow/data/smoothedfollowDisabled.qml b/tests/auto/declarative/qdeclarativesmoothedfollow/data/smoothedfollowDisabled.qml
deleted file mode 100644
index 486bdee..0000000
--- a/tests/auto/declarative/qdeclarativesmoothedfollow/data/smoothedfollowDisabled.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 300; height: 300;
-    Rectangle {
-        objectName: "theRect"
-        color: "red"
-        width: 60; height: 60;
-        x: 100; y: 100;
-        SmoothedFollow on x { id: animX; objectName: "animX"; to: 200; enabled: true; duration: 200 }
-        SmoothedFollow on y { id: animY; objectName: "animY"; to: 200; enabled: false; duration: 200 }
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativesmoothedfollow/data/smoothedfollowValueSource.qml b/tests/auto/declarative/qdeclarativesmoothedfollow/data/smoothedfollowValueSource.qml
deleted file mode 100644
index 2e01d74..0000000
--- a/tests/auto/declarative/qdeclarativesmoothedfollow/data/smoothedfollowValueSource.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 300; height: 300;
-    Rectangle {
-        objectName: "theRect"
-        color: "red"
-        width: 60; height: 60;
-        x: 100; y: 100;
-        SmoothedFollow on x { objectName: "easeX"; to: 200; velocity: 500 }
-        SmoothedFollow on y { objectName: "easeY"; to: 200; duration: 250; velocity: 500 }
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativesmoothedfollow/tst_qdeclarativesmoothedfollow.cpp b/tests/auto/declarative/qdeclarativesmoothedfollow/tst_qdeclarativesmoothedfollow.cpp
deleted file mode 100644
index b9ac23f..0000000
--- a/tests/auto/declarative/qdeclarativesmoothedfollow/tst_qdeclarativesmoothedfollow.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
-#include <QtDeclarative/qdeclarativeview.h>
-
-#include <private/qdeclarativesmoothedfollow_p.h>
-#include <private/qdeclarativerectangle_p.h>
-#include <private/qdeclarativevaluetype_p.h>
-#include "../../../shared/util.h"
-
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
-class tst_qdeclarativesmoothedfollow : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qdeclarativesmoothedfollow();
-
-private slots:
-    void defaultValues();
-    void values();
-    void disabled();
-    void valueSource();
-    void followTo();
-
-private:
-    QDeclarativeEngine engine;
-};
-
-tst_qdeclarativesmoothedfollow::tst_qdeclarativesmoothedfollow()
-{
-}
-
-void tst_qdeclarativesmoothedfollow::defaultValues()
-{
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/smoothedfollow1.qml"));
-    QDeclarativeSmoothedFollow *obj = qobject_cast<QDeclarativeSmoothedFollow*>(c.create());
-
-    QVERIFY(obj != 0);
-
-    QCOMPARE(obj->to(), 0.);
-    QCOMPARE(obj->velocity(), 200.);
-    QCOMPARE(obj->duration(), -1);
-    QCOMPARE(obj->maximumEasingTime(), -1);
-    QCOMPARE(obj->reversingMode(), QDeclarativeSmoothedFollow::Eased);
-
-    delete obj;
-}
-
-void tst_qdeclarativesmoothedfollow::values()
-{
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/smoothedfollow2.qml"));
-    QDeclarativeSmoothedFollow *obj = qobject_cast<QDeclarativeSmoothedFollow*>(c.create());
-
-    QVERIFY(obj != 0);
-
-    QCOMPARE(obj->to(), 10.);
-    QCOMPARE(obj->velocity(), 200.);
-    QCOMPARE(obj->duration(), 300);
-    QCOMPARE(obj->maximumEasingTime(), -1);
-    QCOMPARE(obj->reversingMode(), QDeclarativeSmoothedFollow::Immediate);
-
-    delete obj;
-}
-
-void tst_qdeclarativesmoothedfollow::disabled()
-{
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/smoothedfollow3.qml"));
-    QDeclarativeSmoothedFollow *obj = qobject_cast<QDeclarativeSmoothedFollow*>(c.create());
-
-    QVERIFY(obj != 0);
-
-    QCOMPARE(obj->to(), 10.);
-    QCOMPARE(obj->velocity(), 250.);
-    QCOMPARE(obj->maximumEasingTime(), 150);
-    QCOMPARE(obj->reversingMode(), QDeclarativeSmoothedFollow::Sync);
-
-    delete obj;
-}
-
-void tst_qdeclarativesmoothedfollow::valueSource()
-{
-    QDeclarativeEngine engine;
-
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/smoothedfollowValueSource.qml"));
-
-    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
-    QVERIFY(rect);
-
-    QDeclarativeRectangle *theRect = rect->findChild<QDeclarativeRectangle*>("theRect");
-    QVERIFY(theRect);
-
-    QDeclarativeSmoothedFollow *easeX = rect->findChild<QDeclarativeSmoothedFollow*>("easeX");
-    QVERIFY(easeX);
-    QVERIFY(easeX->enabled());
-
-    QDeclarativeSmoothedFollow *easeY = rect->findChild<QDeclarativeSmoothedFollow*>("easeY");
-    QVERIFY(easeY);
-    QVERIFY(easeY->enabled());
-
-    // XXX get the proper duration
-    QTest::qWait(200);
-
-    QTRY_COMPARE(theRect->x(), easeX->to());
-    QTRY_COMPARE(theRect->y(), easeY->to());
-
-    QTRY_COMPARE(theRect->x(), qreal(200));
-    QTRY_COMPARE(theRect->y(), qreal(200));
-}
-
-void tst_qdeclarativesmoothedfollow::followTo()
-{
-    QDeclarativeView canvas;
-    canvas.setFixedSize(240,320);
-
-    canvas.setSource(QUrl::fromLocalFile(SRCDIR "/data/smoothedfollowDisabled.qml"));
-    canvas.show();
-    canvas.setFocus();
-    QVERIFY(canvas.rootObject() != 0);
-
-    QDeclarativeRectangle *rect = canvas.rootObject()->findChild<QDeclarativeRectangle*>("theRect");
-    QVERIFY(rect != 0);
-
-    QDeclarativeSmoothedFollow *animX = canvas.rootObject()->findChild<QDeclarativeSmoothedFollow*>("animX");
-    QVERIFY(animX != 0);
-    QDeclarativeSmoothedFollow *animY = canvas.rootObject()->findChild<QDeclarativeSmoothedFollow*>("animY");
-    QVERIFY(animY != 0);
-
-    QVERIFY(animX->enabled());
-    QVERIFY(!animY->enabled());
-
-    // animX should track 'to'
-    animX->setTo(50.0);
-    // animY should not track this 'to' change
-    animY->setTo(50.0);
-
-    // XXX get the proper duration
-    QTest::qWait(250);
-
-    QTRY_COMPARE(rect->x(), animX->to());
-
-    QCOMPARE(rect->x(), 50.0);
-    QCOMPARE(rect->y(), 100.0);
-}
-
-QTEST_MAIN(tst_qdeclarativesmoothedfollow)
-
-#include "tst_qdeclarativesmoothedfollow.moc"
diff --git a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml
new file mode 100644
index 0000000..07587bd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml
@@ -0,0 +1,4 @@
+import Qt 4.7
+
+SpringAnimation {
+}
diff --git a/tests/auto/declarative/qdeclarativespringfollow/data/springfollow2.qml b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml
index 31a740a..562f44a 100644
--- a/tests/auto/declarative/qdeclarativespringfollow/data/springfollow2.qml
+++ b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml
@@ -1,8 +1,9 @@
 import Qt 4.7
 
-SpringFollow {
+SpringAnimation {
     to: 1.44; velocity: 0.9
     spring: 1.0; damping: 0.5
     epsilon: 0.25; modulus: 360.0
-    mass: 2.0; enabled: true
+    mass: 2.0; 
+    running: true;
 }
diff --git a/tests/auto/declarative/qdeclarativespringfollow/data/springfollow3.qml b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml
index 0fa4aa9..9f70bf4 100644
--- a/tests/auto/declarative/qdeclarativespringfollow/data/springfollow3.qml
+++ b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml
@@ -1,8 +1,8 @@
 import Qt 4.7
 
-SpringFollow {
+SpringAnimation {
     to: 1.44; velocity: 0.9
     spring: 1.0; damping: 0.5
     epsilon: 0.25; modulus: 360.0
-    mass: 2.0; enabled: false
+    mass: 2.0; running: false
 }
diff --git a/tests/auto/declarative/qdeclarativesmoothedfollow/qdeclarativesmoothedfollow.pro b/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro
index dff4922..213b262 100644
--- a/tests/auto/declarative/qdeclarativesmoothedfollow/qdeclarativesmoothedfollow.pro
+++ b/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative gui
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qdeclarativesmoothedfollow.cpp
+SOURCES += tst_qdeclarativespringanimation.cpp
 
 symbian: {
     importFiles.sources = data
diff --git a/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp b/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp
index e0e2892..4b17a47 100644
--- a/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp
+++ b/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp
@@ -41,7 +41,7 @@
 #include <qtest.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
-#include <private/qdeclarativespringfollow_p.h>
+#include <private/qdeclarativespringanimation_p.h>
 #include <private/qdeclarativevaluetype_p.h>
 #include "../../../shared/util.h"
 
@@ -50,11 +50,11 @@
 #define SRCDIR "."
 #endif
 
-class tst_qdeclarativespringfollow : public QObject
+class tst_qdeclarativespringanimation : public QObject
 {
     Q_OBJECT
 public:
-    tst_qdeclarativespringfollow();
+    tst_qdeclarativespringanimation();
 
 private slots:
     void defaultValues();
@@ -65,15 +65,15 @@ private:
     QDeclarativeEngine engine;
 };
 
-tst_qdeclarativespringfollow::tst_qdeclarativespringfollow()
+tst_qdeclarativespringanimation::tst_qdeclarativespringanimation()
 {
 }
 
-void tst_qdeclarativespringfollow::defaultValues()
+void tst_qdeclarativespringanimation::defaultValues()
 {
     QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow1.qml"));
-    QDeclarativeSpringFollow *obj = qobject_cast<QDeclarativeSpringFollow*>(c.create());
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springanimation1.qml"));
+    QDeclarativeSpringAnimation *obj = qobject_cast<QDeclarativeSpringAnimation*>(c.create());
 
     QVERIFY(obj != 0);
 
@@ -83,19 +83,17 @@ void tst_qdeclarativespringfollow::defaultValues()
     QCOMPARE(obj->damping(), 0.);
     QCOMPARE(obj->epsilon(), 0.01);
     QCOMPARE(obj->modulus(), 0.);
-    QCOMPARE(obj->value(), 0.);
     QCOMPARE(obj->mass(), 1.);
-    QCOMPARE(obj->enabled(), true);
-    QCOMPARE(obj->inSync(), true);
+    QCOMPARE(obj->isRunning(), false);
 
     delete obj;
 }
 
-void tst_qdeclarativespringfollow::values()
+void tst_qdeclarativespringanimation::values()
 {
     QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow2.qml"));
-    QDeclarativeSpringFollow *obj = qobject_cast<QDeclarativeSpringFollow*>(c.create());
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springanimation2.qml"));
+    QDeclarativeSpringAnimation *obj = qobject_cast<QDeclarativeSpringAnimation*>(c.create());
 
     QVERIFY(obj != 0);
 
@@ -106,19 +104,18 @@ void tst_qdeclarativespringfollow::values()
     QCOMPARE(obj->epsilon(), 0.25);
     QCOMPARE(obj->modulus(), 360.0);
     QCOMPARE(obj->mass(), 2.0);
-    QCOMPARE(obj->enabled(), true);
+    QCOMPARE(obj->isRunning(), true);
 
-    QTRY_COMPARE(obj->value(), 1.44);
-    QTRY_COMPARE(obj->inSync(), true);
+    QTRY_COMPARE(obj->isRunning(), false);
 
     delete obj;
 }
 
-void tst_qdeclarativespringfollow::disabled()
+void tst_qdeclarativespringanimation::disabled()
 {
     QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow3.qml"));
-    QDeclarativeSpringFollow *obj = qobject_cast<QDeclarativeSpringFollow*>(c.create());
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springanimation3.qml"));
+    QDeclarativeSpringAnimation *obj = qobject_cast<QDeclarativeSpringAnimation*>(c.create());
 
     QVERIFY(obj != 0);
 
@@ -129,14 +126,11 @@ void tst_qdeclarativespringfollow::disabled()
     QCOMPARE(obj->epsilon(), 0.25);
     QCOMPARE(obj->modulus(), 360.0);
     QCOMPARE(obj->mass(), 2.0);
-    QCOMPARE(obj->enabled(), false);
-
-    QCOMPARE(obj->value(), 0.0);
-    QCOMPARE(obj->inSync(), false);
+    QCOMPARE(obj->isRunning(), false);
 
     delete obj;
 }
 
-QTEST_MAIN(tst_qdeclarativespringfollow)
+QTEST_MAIN(tst_qdeclarativespringanimation)
 
-#include "tst_qdeclarativespringfollow.moc"
+#include "tst_qdeclarativespringanimation.moc"
diff --git a/tests/auto/declarative/qdeclarativespringfollow/data/springfollow1.qml b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow1.qml
deleted file mode 100644
index 8528cfa..0000000
--- a/tests/auto/declarative/qdeclarativespringfollow/data/springfollow1.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Qt 4.7
-
-SpringFollow {
-}
diff --git a/tests/auto/declarative/qdeclarativespringfollow/qdeclarativespringfollow.pro b/tests/auto/declarative/qdeclarativespringfollow/qdeclarativespringfollow.pro
deleted file mode 100644
index 1c17ba0..0000000
--- a/tests/auto/declarative/qdeclarativespringfollow/qdeclarativespringfollow.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qdeclarativespringfollow.cpp
-
-symbian: {
-    importFiles.sources = data
-    importFiles.path = .
-    DEPLOYMENT = importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
-
-CONFIG += parallel_test
-
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index 9ae7c99..859221e 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -429,6 +429,8 @@ void tst_qdeclarativetextinput::horizontalAlignment()
     QImage expect(expectfile);
 
     QCOMPARE(actual,expect);
+
+    delete canvas;
 }
 
 void tst_qdeclarativetextinput::positionAt()
@@ -473,11 +475,13 @@ void tst_qdeclarativetextinput::positionAt()
 
 void tst_qdeclarativetextinput::maxLength()
 {
-    //QString componentStr = "import Qt 4.7\nTextInput {  maximumLength: 10; }";
     QDeclarativeView *canvas = createView(SRCDIR "/data/maxLength.qml");
+    QVERIFY(canvas->rootObject() != 0);
     canvas->show();
     canvas->setFocus();
-    QVERIFY(canvas->rootObject() != 0);
+    QApplication::setActiveWindow(canvas);
+    QTest::qWaitForWindowShown(canvas);
+
     QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput *>(canvas->rootObject());
     QVERIFY(textinputObject != 0);
     QVERIFY(textinputObject->text().isEmpty());
diff --git a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
index 9660430..695c038 100644
--- a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
+++ b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
@@ -132,6 +132,8 @@ void tst_QDeclarativeViewer::orientation()
     QCOMPARE(viewer->view()->sceneRect().size(), QSizeF(200, 300));
     QCOMPARE(viewer->size(), QSize(200, 300 + MENUBAR_HEIGHT(viewer)));
     QCOMPARE(viewer->size(), viewer->sizeHint());
+
+    delete viewer;
 }
 
 void tst_QDeclarativeViewer::loading()
@@ -201,6 +203,8 @@ void tst_QDeclarativeViewer::loading()
     QCOMPARE(viewer->view()->sceneRect().size(), QSizeF(200, 300));
     QCOMPARE(viewer->size(), QSize(200, 300+viewer->menuBar()->height()));
     QCOMPARE(viewer->size(), viewer->sizeHint());
+
+    delete viewer;
 }
 
 void tst_QDeclarativeViewer::fileBrowser()
@@ -235,6 +239,8 @@ void tst_QDeclarativeViewer::fileBrowser()
     QVERIFY(viewer->view());
     QVERIFY(viewer->menuBar());
     QVERIFY(browserItem);
+
+    delete viewer;
 }
 
 void tst_QDeclarativeViewer::resizing()
@@ -290,6 +296,8 @@ void tst_QDeclarativeViewer::resizing()
     rootItem->setWidth(150);
     rootItem->setHeight(200);
     QTRY_COMPARE(viewer->size(), QSize(250, 350));
+
+    delete viewer;
 }
 
 void tst_QDeclarativeViewer::paths()
@@ -302,6 +310,8 @@ void tst_QDeclarativeViewer::paths()
 
     viewer->addPluginPath("miscPluginPath");
     viewer->view()->engine()->pluginPathList().contains("miscPluginPath");
+
+    delete viewer;
 }
 
 void tst_QDeclarativeViewer::slowMode()
@@ -311,6 +321,8 @@ void tst_QDeclarativeViewer::slowMode()
 
     viewer->setSlowMode(true);
     viewer->setSlowMode(false);
+
+    delete viewer;
 }
 
 QTEST_MAIN(tst_QDeclarativeViewer)