Fix transitions broken: http://kdenlive.org/mantis/view.php?id=2404

Also fix a few CMakeLists missing newline

diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 638133517b909f5235c9ceebca3663bb2c83584e..6ab32fbdd5dd4f8fabadeccb8c77ae2c5f17002e 100644 (file)
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1,3 +1,3 @@
 #FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.svg*")
 kde4_install_icons( ${DATA_INSTALL_DIR}/kdenlive/icons)
-#install( FILES ${files} DESTINATION ${ICON_INSTALL_DIR} )
\ No newline at end of file
+#install( FILES ${files} DESTINATION ${ICON_INSTALL_DIR} )

diff --git a/src/abstractclipitem.h b/src/abstractclipitem.h
index 060d538e1b5aa6e28994bc4454988186bda4a1e9..8703c919bcff6fbff4d96b2cdb265679963a49d0 100644 (file)
--- a/src/abstractclipitem.h
+++ b/src/abstractclipitem.h
@@ -37,9 +37,7 @@ class QGraphicsSceneMouseEvent;
 class AbstractClipItem : public QObject, public QGraphicsRectItem
 {
     Q_OBJECT
-#if QT_VERSION >= 0x040600
     Q_PROPERTY(QRectF rect READ rect WRITE setRect)
-#endif
 
 public:
     AbstractClipItem(const ItemInfo &info, const QRectF& rect, double fps);

diff --git a/src/mimetypes/CMakeLists.txt b/src/mimetypes/CMakeLists.txt
index 8a0e869e9c86899900008b590c9611a47f0c416d..b82456b169106c3a5b1f19dc15115db34afd3a58 100644 (file)
--- a/src/mimetypes/CMakeLists.txt
+++ b/src/mimetypes/CMakeLists.txt
@@ -1,4 +1,4 @@
 find_package(SharedMimeInfo REQUIRED)
 
 install(FILES kdenlive.xml westley.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
-update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
\ No newline at end of file
+update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})

diff --git a/src/transition.cpp b/src/transition.cpp
index a43a8ce8c1beff1c1db562020c4bbc6cc07f61de..b9a4ed9478aef0e15c1f49de03f32db8e23df415 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -51,8 +51,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);

diff --git a/src/transition.h b/src/transition.h
index 49b90e0637dee857ee7dc70ac2f4aaf8a31fa5e5..614d37eaef2536309b10279c61f2447cf6d8d59b 100644 (file)
--- a/src/transition.h
+++ b/src/transition.h
@@ -82,7 +82,7 @@ public:
     int defaultZValue() const;
     /** @brief When a transition is resized, check if keyframes are out of the transition and fix if necessary. */
     bool updateKeyframes();
-    void animate();
+
 protected:
     virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);