Add support for svg items in titles

	modified:   configure
	modified:   kdenlivetitle_wrapper.cpp

diff --git a/src/modules/qimage/configure b/src/modules/qimage/configure
index cf59012bafb15dfc855aa7fc5b982cabec551004..6d1f510e1b71d4c2ac6910acbd6602e6c6378517 100755 (executable)
--- a/src/modules/qimage/configure
+++ b/src/modules/qimage/configure
@@ -72,8 +72,8 @@ else
                qt4_found=true
                echo "#define USE_QT4" > config.h
                echo "USE_QT4=1" > config.mak
-               echo QTCXXFLAGS=$(pkg-config --cflags QtCore QtGui QtXml ) >> config.mak
-               echo QTLIBS=$(pkg-config --libs QtCore QtGui QtXml) >> config.mak
+               echo QTCXXFLAGS=$(pkg-config --cflags QtCore QtGui QtXml QtSvg ) >> config.mak
+               echo QTLIBS=$(pkg-config --libs QtCore QtGui QtXml QtSvg) >> config.mak
                
        elif [ -d "$qimage_libdir" -a -d "$qimage_includedir" ]
        then
@@ -97,11 +97,11 @@ else
                        echo "USE_QT4=1" >> config.mak
                        if [ -d "$qimage_libdir/QtGui.framework" ]
                        then
-                               echo QTCXXFLAGS=$(pkg-config --cflags QtCore QtGui QtXml ) >> config.mak
-                               echo QTLIBS=$(pkg-config --libs QtCore QtGui QtXml) >> config.mak
+                               echo QTCXXFLAGS=$(pkg-config --cflags QtCore QtGui QtXml QtSvg ) >> config.mak
+                               echo QTLIBS=$(pkg-config --libs QtCore QtGui QtXml QtSvg) >> config.mak
                        else
                                echo QTCXXFLAGS=-I$qimage_includedir >> config.mak
-                               echo QTLIBS=-L$qimage_libdir -lQtCore -lQtGui >> config.mak
+                               echo QTLIBS=-L$qimage_libdir -lQtCore -lQtGui -lQtSvg >> config.mak
                        fi
                else 
                    if [ -d "$kde_includedir" ]

diff --git a/src/modules/qimage/kdenlivetitle_wrapper.cpp b/src/modules/qimage/kdenlivetitle_wrapper.cpp
index f34b71a05d135c8578fd69e80f0f6a0332e92bfe..9166a32d7dc77207fbcad932273643329c1fda8c 100644 (file)
--- a/src/modules/qimage/kdenlivetitle_wrapper.cpp
+++ b/src/modules/qimage/kdenlivetitle_wrapper.cpp
@@ -27,6 +27,7 @@
 #include <QtCore/QMutex>
 #include <QtGui/QGraphicsScene>
 #include <QtGui/QGraphicsTextItem>
+#include <QtSvg/QGraphicsSvgItem>
 #include <QtGui/QTextCursor>
 #include <QtGui/QStyleOptionGraphicsItem>
 
@@ -216,7 +217,7 @@ void loadFromXml( mlt_producer producer, QGraphicsScene *scene, const char *temp
                                }
                                else if ( items.item( i ).attributes().namedItem( "type" ).nodeValue() == "QGraphicsPixmapItem" )
                                {
-                                       QString url = items.item( i ).namedItem( "content" ).attributes().namedItem( "url" ).nodeValue();
+                                       const QString url = items.item( i ).namedItem( "content" ).attributes().namedItem( "url" ).nodeValue();
                                        QImage img( url );
                                        ImageItem *rec = new ImageItem(img);
                                        scene->addItem( rec );
@@ -224,11 +225,10 @@ void loadFromXml( mlt_producer producer, QGraphicsScene *scene, const char *temp
                                }
                                else if ( items.item( i ).attributes().namedItem( "type" ).nodeValue() == "QGraphicsSvgItem" )
                                {
-                                       QString url = items.item( i ).namedItem( "content" ).attributes().namedItem( "url" ).nodeValue();
-                                       //QGraphicsSvgItem *rec = new QGraphicsSvgItem(url);
-                                       //m_scene->addItem(rec);
-                                       //rec->setData(Qt::UserRole, url);
-                                       //gitem = rec;
+                                       const QString url = items.item( i ).namedItem( "content" ).attributes().namedItem( "url" ).nodeValue();
+                                       QGraphicsSvgItem *rec = new QGraphicsSvgItem(url);
+                                       scene->addItem(rec);
+                                       gitem = rec;
                                }
                        }
                        //pos and transform