summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativespringanimation
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-10-06 11:12:30 (GMT)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-10-06 11:12:30 (GMT)
commiteaef6f8b4a7ad637a59b4fe2ec623d26a7cae96f (patch)
tree4868b097a6e1d5814ae557c464f70c879ffd8e9d /tests/auto/declarative/qdeclarativespringanimation
parentfe0319a84082cb97a2007ca82af153a785a0938e (diff)
parent24c89f6d1c090ab670d4f883d06cd0413c2ecc65 (diff)
downloadQt-eaef6f8b4a7ad637a59b4fe2ec623d26a7cae96f.zip
Qt-eaef6f8b4a7ad637a59b4fe2ec623d26a7cae96f.tar.gz
Qt-eaef6f8b4a7ad637a59b4fe2ec623d26a7cae96f.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativespringanimation')
-rw-r--r--tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml
index 07587bd..8890a78 100644
--- a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml
+++ b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
SpringAnimation {
}
diff --git a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml
index 562f44a..de75bb0 100644
--- a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml
+++ b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
SpringAnimation {
to: 1.44; velocity: 0.9
diff --git a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml
index 9f70bf4..b68d769 100644
--- a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml
+++ b/tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
SpringAnimation {
to: 1.44; velocity: 0.9