Merge dev into 5.12

Change-Id: I63f632b595f66d2fc93e9aa713500e3799e3df2a

1 files changed, 2 insertions, 2 deletions

diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
index 86c1fa243c..008560d856 100644
--- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -167,7 +167,7 @@ AnchorData::~AnchorData()
     if (graphicsAnchor) {
         // Remove reference to ourself to avoid double removal in
         // QGraphicsAnchorPrivate dtor.
-        graphicsAnchor->d_func()->data = 0;
+        QGraphicsAnchorPrivate::get(graphicsAnchor)->data = nullptr;
 
         delete graphicsAnchor;
     }
@@ -215,7 +215,7 @@ void AnchorData::refreshSizeHints(const QLayoutStyleInfo *styleInfo)
     } else {
         // It is a user-created anchor, fetch size information from the associated QGraphicsAnchor
         Q_ASSERT(graphicsAnchor);
-        QGraphicsAnchorPrivate *anchorPrivate = graphicsAnchor->d_func();
+        QGraphicsAnchorPrivate *anchorPrivate = QGraphicsAnchorPrivate::get(graphicsAnchor);
 
         // Policy, min and max sizes are straightforward
         policy = anchorPrivate->sizePolicy;