Merge branch 'master' of git://anongit.kde.org/kdenlive

[kdenlive] / src / transition.cpp

diff --git a/src/transition.cpp b/src/transition.cpp
index a43a8ce8c1beff1c1db562020c4bbc6cc07f61de..d9e931d2d9c3cefa920fdc772b1b75b80f8229b6 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -29,8 +29,9 @@
 #include <QDomElement>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
+#if QT_VERSION >= 0x040600
 #include <QPropertyAnimation>
-
+#endif
 
 Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) :
         AbstractClipItem(info, QRectF(), fps),
@@ -51,8 +52,8 @@ Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QD
     else {
         QPropertyAnimation *startAnimation = new QPropertyAnimation(this, "rect");
         startAnimation->setDuration(200);
-        QRectF r(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight() / 2);
-        QRectF r2(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)itemHeight());
+        const QRectF r(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight() / 2);
+        const QRectF r2(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)itemHeight());
         startAnimation->setStartValue(r);
         startAnimation->setEndValue(r2);
         startAnimation->setEasingCurve(QEasingCurve::OutQuad);
@@ -305,11 +306,13 @@ OPERATIONTYPE Transition::operationMode(QPointF pos)
     return MOVE;
 }
 
+//static
 int Transition::itemHeight()
 {
     return (int) (KdenliveSettings::trackheight() / 3 * 2 - 1);
 }
 
+//static
 int Transition::itemOffset()
 {
     return (int) (KdenliveSettings::trackheight() / 3 * 2);