diff options
author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-05-12 15:01:55 (GMT) |
---|---|---|
committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-05-12 15:01:55 (GMT) |
commit | d41ccae68683dd0d35c20affec7e5c55ce6bca37 (patch) | |
tree | 270fe804f2b130243da4e714cc1a135690bc466d /src/declarative/util/qdeclarativeanimation_p.h | |
parent | 5987412720498aa22202a1bcca3cb988a9cf5606 (diff) | |
parent | 41cbfc5c8e6644ab21e92860db95b2e8da9aba6a (diff) | |
download | Qt-d41ccae68683dd0d35c20affec7e5c55ce6bca37.zip Qt-d41ccae68683dd0d35c20affec7e5c55ce6bca37.tar.gz Qt-d41ccae68683dd0d35c20affec7e5c55ce6bca37.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativeanimation_p.h')
-rw-r--r-- | src/declarative/util/qdeclarativeanimation_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h index 40c893c..e7cd8a8 100644 --- a/src/declarative/util/qdeclarativeanimation_p.h +++ b/src/declarative/util/qdeclarativeanimation_p.h @@ -133,6 +133,7 @@ public: private Q_SLOTS: void timelineComplete(); + void componentFinalized(); private: virtual void setTarget(const QDeclarativeProperty &); |