Compile fixes after latest merge of 4.6.

The ususal suspects like QScopedPointer fixes, but also some changes
since the introduction of qcore_unix.*

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index 3d9f8a6..c395cd6 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -171,11 +171,11 @@ public:
 
     static const QGraphicsItemPrivate *get(const QGraphicsItem *item)
     {
-        return item->d_ptr;
+        return item->d_ptr.data();
     }
     static QGraphicsItemPrivate *get(QGraphicsItem *item)
     {
-        return item->d_ptr;
+        return item->d_ptr.data();
     }
 
     void updateAncestorFlag(QGraphicsItem::GraphicsItemFlag childFlag,
@@ -514,8 +514,8 @@ struct QGraphicsItemPrivate::TransformData {
 inline bool qt_closestLeaf(const QGraphicsItem *item1, const QGraphicsItem *item2)
 {
     // Return true if sibling item1 is on top of item2.
-    const QGraphicsItemPrivate *d1 = item1->d_ptr;
-    const QGraphicsItemPrivate *d2 = item2->d_ptr;
+    const QGraphicsItemPrivate *d1 = item1->d_ptr.data();
+    const QGraphicsItemPrivate *d2 = item2->d_ptr.data();
     bool f1 = d1->flags & QGraphicsItem::ItemStacksBehindParent;
     bool f2 = d2->flags & QGraphicsItem::ItemStacksBehindParent;
     if (f1 != f2)