summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-14 04:29:46 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-14 04:29:46 (GMT)
commitb49ac3b14d4201e4f9ab34873ee373b2b6dff14b (patch)
tree15d31f5edf66a4d475ea9127c42949e6c599ec39 /src/declarative/util
parente36c3f700280ecca2d6333987897a3377772d385 (diff)
parentc94c7e6609f117a277862992d13e2ef35bafccd9 (diff)
downloadQt-b49ac3b14d4201e4f9ab34873ee373b2b6dff14b.zip
Qt-b49ac3b14d4201e4f9ab34873ee373b2b6dff14b.tar.gz
Qt-b49ac3b14d4201e4f9ab34873ee373b2b6dff14b.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qdeclarativesmoothedfollow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativesmoothedfollow.cpp b/src/declarative/util/qdeclarativesmoothedfollow.cpp
index 63c9618..9f155fc 100644
--- a/src/declarative/util/qdeclarativesmoothedfollow.cpp
+++ b/src/declarative/util/qdeclarativesmoothedfollow.cpp
@@ -86,7 +86,7 @@ public:
The follow example shows one rectangle tracking the position of another.
\code
-import Qt 4.6
+import Qt 4.7
Rectangle {
width: 800; height: 600; color: "blue"