summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qs60style_p.h
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-09-06 06:41:41 (GMT)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-09-06 06:41:41 (GMT)
commit4cd5e0dbdf5a8f6142d3961b05dbf35d3144e8cb (patch)
tree92fb3640aa52ab2b29c35fe4e2be976bd8dc25eb /src/gui/styles/qs60style_p.h
parent9f56ef9d1538e9edf9dc7bdb3bf696e647c0c092 (diff)
parent91b1eff723c47fbe12d406a27053eea7d6c4a812 (diff)
downloadQt-4cd5e0dbdf5a8f6142d3961b05dbf35d3144e8cb.zip
Qt-4cd5e0dbdf5a8f6142d3961b05dbf35d3144e8cb.tar.gz
Qt-4cd5e0dbdf5a8f6142d3961b05dbf35d3144e8cb.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/styles/qs60style_p.h')
-rw-r--r--src/gui/styles/qs60style_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index 836969a..51ced96 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -571,6 +571,7 @@ public:
void startAnimation(QS60StyleEnums::SkinParts animation);
void stopAnimation(QS60StyleEnums::SkinParts animation);
static QS60StyleAnimation* animationDefinition(QS60StyleEnums::SkinParts part);
+ static void removeAnimations();
#endif