1 files changed, 7 insertions, 5 deletions
diff --git a/src/widgets/graphicsview/qgraphicswidget_p.h b/src/widgets/graphicsview/qgraphicswidget_p.h
index 505a2a24c0..e4cc2c3016 100644
--- a/src/widgets/graphicsview/qgraphicswidget_p.h
+++ b/src/widgets/graphicsview/qgraphicswidget_p.h
@@ -60,6 +60,8 @@
 #include <QtWidgets/qsizepolicy.h>
 #include <QtWidgets/qstyle.h>
 
+#include <memory>
+
 QT_REQUIRE_CONFIG(graphicsview);
 
 QT_BEGIN_NAMESPACE
@@ -78,11 +80,10 @@ public:
     qreal titleBarHeight(const QStyleOptionTitleBar &options) const;
 
     // Margins
-    enum {Left, Top, Right, Bottom};
-    mutable qreal *margins;
+    mutable std::unique_ptr<QMarginsF> margins;
     void ensureMargins() const;
 
-    void fixFocusChainBeforeReparenting(QGraphicsWidget *newParent, QGraphicsScene *oldScene, QGraphicsScene *newScene = 0);
+    void fixFocusChainBeforeReparenting(QGraphicsWidget *newParent, QGraphicsScene *oldScene, QGraphicsScene *newScene = nullptr);
     void setLayout_helper(QGraphicsLayout *l);
 
     // Layouts
@@ -189,11 +190,12 @@ public:
             , buttonMouseOver(false)
             , buttonSunken(false)
         {}
-    } *windowData;
+    };
+    std::unique_ptr<WindowData> windowData;
     void ensureWindowData();
 
     bool setWindowFrameMargins;
-    mutable qreal *windowFrameMargins;
+    mutable std::unique_ptr<QMarginsF> windowFrameMargins;
     void ensureWindowFrameMargins() const;
 
 #ifndef QT_NO_ACTION