4 files changed, 3 insertions, 5 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
index 1964ee4..01c3e37 100644
--- a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
@@ -71,7 +71,6 @@ QML_DEFINE_TYPE(Qt,4,6,BorderImage,QmlGraphicsBorderImage)
 QmlGraphicsBorderImage::QmlGraphicsBorderImage(QmlGraphicsItem *parent)
   : QmlGraphicsImageBase(*(new QmlGraphicsBorderImagePrivate), parent)
 {
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
 }
 
 QmlGraphicsBorderImage::~QmlGraphicsBorderImage()
diff --git a/src/declarative/graphicsitems/qmlgraphicsimage.cpp b/src/declarative/graphicsitems/qmlgraphicsimage.cpp
index 38df0c7..a777de7 100644
--- a/src/declarative/graphicsitems/qmlgraphicsimage.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsimage.cpp
@@ -128,13 +128,11 @@ QML_DEFINE_TYPE(Qt,4,6,Image,QmlGraphicsImage)
 QmlGraphicsImage::QmlGraphicsImage(QmlGraphicsItem *parent)
   : QmlGraphicsImageBase(*(new QmlGraphicsImagePrivate), parent)
 {
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
 }
 
 QmlGraphicsImage::QmlGraphicsImage(QmlGraphicsImagePrivate &dd, QmlGraphicsItem *parent)
   : QmlGraphicsImageBase(dd, parent)
 {
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
 }
 
 QmlGraphicsImage::~QmlGraphicsImage()
diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
index b7ed7b6..70ca59c 100644
--- a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 QmlGraphicsImageBase::QmlGraphicsImageBase(QmlGraphicsImageBasePrivate &dd, QmlGraphicsItem *parent)
   : QmlGraphicsItem(dd, parent)
 {
-    setFlag(QGraphicsItem::ItemHasNoContents, true);
+    setFlag(QGraphicsItem::ItemHasNoContents, false);
 }
 
 QmlGraphicsImageBase::~QmlGraphicsImageBase()
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
index 1b2861d..68a565d 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
@@ -1491,6 +1491,7 @@ QmlGraphicsItem::~QmlGraphicsItem()
     d->dependantAnchors.clear();
     delete d->_anchorLines; d->_anchorLines = 0;
     delete d->_anchors; d->_anchors = 0;
+    delete d->_stateGroup; d->_stateGroup = 0;
 }
 
 /*!
@@ -2620,7 +2621,7 @@ QmlStateGroup *QmlGraphicsItemPrivate::states()
 {
     Q_Q(QmlGraphicsItem);
     if (!_stateGroup) {
-        _stateGroup = new QmlStateGroup(q);
+        _stateGroup = new QmlStateGroup;
         if (!_componentComplete)
             _stateGroup->classBegin();
         QObject::connect(_stateGroup, SIGNAL(stateChanged(QString)),