summaryrefslogtreecommitdiffstats
path: root/examples/effects/fademessage/fademessage.h
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2009-11-17 22:56:58 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2009-11-17 22:56:58 (GMT)
commite22ca6088407987cb69ccd03f162b431d5c2bf99 (patch)
tree12bb1de5c59670ad2c966cea60b9fd4d28dead2e /examples/effects/fademessage/fademessage.h
parentf2b02ed855f7149afca0cc2e046c09c54a2d4444 (diff)
parenta61adccf96a8ceefbf1150966adda3f6d226ec6d (diff)
downloadQt-e22ca6088407987cb69ccd03f162b431d5c2bf99.zip
Qt-e22ca6088407987cb69ccd03f162b431d5c2bf99.tar.gz
Qt-e22ca6088407987cb69ccd03f162b431d5c2bf99.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'examples/effects/fademessage/fademessage.h')
-rw-r--r--examples/effects/fademessage/fademessage.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/examples/effects/fademessage/fademessage.h b/examples/effects/fademessage/fademessage.h
index 34e2fb8..e73ef6b 100644
--- a/examples/effects/fademessage/fademessage.h
+++ b/examples/effects/fademessage/fademessage.h
@@ -44,7 +44,7 @@
#include <QGraphicsEffect>
#include <QGraphicsView>
-#include <QTimeLine>
+#include <QPropertyAnimation>
#include "fademessage.h"
@@ -62,11 +62,10 @@ private slots:
void togglePopup();
private:
- qreal m_index;
QGraphicsScene m_scene;
QGraphicsColorizeEffect *m_effect;
QGraphicsItem *m_message;
- QTimeLine *m_timeLine;
+ QPropertyAnimation *m_animation;
};
#endif // FADEMESSAGE_H