diff options
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 2 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicstransform.cpp | 2 | ||||
| -rw-r--r-- | src/xml/sax/qxml.cpp | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 731a9a9fe4..db00fbd69b 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1201,7 +1201,7 @@ QGraphicsItem::~QGraphicsItem() if (d_ptr->transformData) { for(int i = 0; i < d_ptr->transformData->graphicsTransforms.size(); ++i) { QGraphicsTransform *t = d_ptr->transformData->graphicsTransforms.at(i); - static_cast<QGraphicsTransformPrivate *>(t->d_ptr)->item = 0; + static_cast<QGraphicsTransformPrivate *>(t->d_ptr.data())->item = 0; delete t; } } diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp index b55d78e606..a71d5cc794 100644 --- a/src/gui/graphicsview/qgraphicstransform.cpp +++ b/src/gui/graphicsview/qgraphicstransform.cpp @@ -59,7 +59,7 @@ void QGraphicsTransformPrivate::setItem(QGraphicsItem *i) if (item) { Q_Q(QGraphicsTransform); - QGraphicsItemPrivate *d_ptr = item->d_ptr; + QGraphicsItemPrivate *d_ptr = item->d_ptr.data(); item->prepareGeometryChange(); Q_ASSERT(d_ptr->transformData); diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index 9177490c28..96a509d02d 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -568,9 +568,10 @@ QXmlParseException::QXmlParseException(const QString& name, int c, int l, /*! Creates a copy of \a other. */ -QXmlParseException::QXmlParseException(const QXmlParseException& other) +QXmlParseException::QXmlParseException(const QXmlParseException& other) : + d(new QXmlParseExceptionPrivate(*other.d)) { - d = new QXmlParseExceptionPrivate(*other.d); + } /*! |