4 files changed, 7 insertions, 5 deletions
diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h
index ddf8ba6bf1..738ea0675c 100644
--- a/src/svg/qgraphicssvgitem.h
+++ b/src/svg/qgraphicssvgitem.h
@@ -41,8 +41,8 @@
 #ifndef QGRAPHICSSVGITEM_H
 #define QGRAPHICSSVGITEM_H
 
-#include <QtGui/qgraphicsitem.h>
 #include <QtCore/qobject.h>
+#include <QtGui/qgraphicsitem.h>
 
 #ifndef QT_NO_GRAPHICSSVGITEM
 
@@ -89,9 +89,9 @@ private:
 
     // Q_DECLARE_PRIVATE_WITH_BASE(QGraphicsSvgItem, QObject)
     inline QGraphicsSvgItemPrivate *d_func()
-    { return reinterpret_cast<QGraphicsSvgItemPrivate *>(QObject::d_ptr); }
+    { return reinterpret_cast<QGraphicsSvgItemPrivate *>(QObject::d_ptr.data()); }
     inline const QGraphicsSvgItemPrivate *d_func() const
-    { return reinterpret_cast<const QGraphicsSvgItemPrivate *>(QObject::d_ptr); }
+    { return reinterpret_cast<const QGraphicsSvgItemPrivate *>(QObject::d_ptr.data()); }
     friend class QGraphicsSvgItemPrivate;
 
     Q_PRIVATE_SLOT(d_func(), void _q_repaintItem())
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp
index ace4cb880e..2936c3f639 100644
--- a/src/svg/qsvggenerator.cpp
+++ b/src/svg/qsvggenerator.cpp
@@ -567,7 +567,6 @@ QSvgGenerator::~QSvgGenerator()
     if (d->owns_iodevice)
         delete d->engine->outputDevice();
     delete d->engine;
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/svg/qsvggenerator.h b/src/svg/qsvggenerator.h
index 8c8a354177..5bbaa8174b 100644
--- a/src/svg/qsvggenerator.h
+++ b/src/svg/qsvggenerator.h
@@ -49,6 +49,7 @@
 #include <QtCore/qnamespace.h>
 #include <QtCore/qiodevice.h>
 #include <QtCore/qobjectdefs.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -100,7 +101,7 @@ protected:
     int metric(QPaintDevice::PaintDeviceMetric metric) const;
 
 private:
-    QSvgGeneratorPrivate *d_ptr;
+    QScopedPointer<QSvgGeneratorPrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index 9a019838f1..d2a4227822 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -40,6 +40,8 @@ SOURCES += \
 
 INCLUDEPATH += ../3rdparty/harfbuzz/src
 
+symbian:TARGET.UID3=0x2001B2E2
+
 #zlib support
 contains(QT_CONFIG, zlib) {
    INCLUDEPATH += ../3rdparty/zlib