summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmleasefollow.cpp
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-11-05 04:47:57 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-11-05 04:47:57 (GMT)
commitf6caaf073408da5c85329fb4849e23f97621ea85 (patch)
tree8a460398e00eda896d4eabc34c40bb1e65f4ce95 /src/declarative/util/qmleasefollow.cpp
parent0ef5d89b540be963d1a8131f6625f990a4fe66e8 (diff)
parentd39ec85b7e5d8702c2888cdad4ccdae72531c199 (diff)
downloadQt-f6caaf073408da5c85329fb4849e23f97621ea85.zip
Qt-f6caaf073408da5c85329fb4849e23f97621ea85.tar.gz
Qt-f6caaf073408da5c85329fb4849e23f97621ea85.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmleasefollow.cpp')
-rw-r--r--src/declarative/util/qmleasefollow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qmleasefollow.cpp b/src/declarative/util/qmleasefollow.cpp
index 5447c56..6bf3f82 100644
--- a/src/declarative/util/qmleasefollow.cpp
+++ b/src/declarative/util/qmleasefollow.cpp
@@ -47,7 +47,7 @@
QT_BEGIN_NAMESPACE
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,EaseFollow,QmlEaseFollow);
+QML_DEFINE_TYPE(Qt,4,6,EaseFollow,QmlEaseFollow);
class QmlEaseFollowPrivate : public QObjectPrivate
{