1 files changed, 15 insertions, 21 deletions

diff --git a/src/widgets/graphicsview/qgraphicswidget_p.cpp b/src/widgets/graphicsview/qgraphicswidget_p.cpp
index 1514fca456..cc08b1c566 100644
--- a/src/widgets/graphicsview/qgraphicswidget_p.cpp
+++ b/src/widgets/graphicsview/qgraphicswidget_p.cpp
@@ -51,6 +51,8 @@
 #include <QtWidgets/QStyleOptionTitleBar>
 #include <QtWidgets/QGraphicsSceneMouseEvent>
 
+#include <private/qmemory_p.h>
+
 QT_BEGIN_NAMESPACE
 
 void QGraphicsWidgetPrivate::init(QGraphicsItem *parentItem, Qt::WindowFlags wFlags)
@@ -109,8 +111,6 @@ QGraphicsWidgetPrivate::QGraphicsWidgetPrivate()
 QGraphicsWidgetPrivate::~QGraphicsWidgetPrivate()
 {
     // Remove any lazily allocated data
-    delete[] margins;
-    delete[] windowFrameMargins;
     delete windowData;
 }
 
@@ -122,11 +122,8 @@ QGraphicsWidgetPrivate::~QGraphicsWidgetPrivate()
 */
 void QGraphicsWidgetPrivate::ensureMargins() const
 {
-    if (!margins) {
-        margins = new qreal[4];
-        for (int i = 0; i < 4; ++i)
-            margins[i] = 0;
-    }
+    if (!margins)
+        margins = qt_make_unique<QMarginsF>();
 }
 
 /*!
@@ -137,11 +134,8 @@ void QGraphicsWidgetPrivate::ensureMargins() const
 */
 void QGraphicsWidgetPrivate::ensureWindowFrameMargins() const
 {
-    if (!windowFrameMargins) {
-        windowFrameMargins = new qreal[4];
-        for (int i = 0; i < 4; ++i)
-            windowFrameMargins[i] = 0;
-    }
+    if (!windowFrameMargins)
+        windowFrameMargins = qt_make_unique<QMarginsF>();
 }
 
 /*!
@@ -196,7 +190,7 @@ void QGraphicsWidgetPrivate::updatePalette(const QPalette &palette)
 
     // Notify change.
     QEvent event(QEvent::PaletteChange);
-    QApplication::sendEvent(q, &event);
+    QCoreApplication::sendEvent(q, &event);
 }
 
 void QGraphicsWidgetPrivate::setLayoutDirection_helper(Qt::LayoutDirection direction)
@@ -218,7 +212,7 @@ void QGraphicsWidgetPrivate::setLayoutDirection_helper(Qt::LayoutDirection direc
 
     // Send the notification event to this widget item.
     QEvent e(QEvent::LayoutDirectionChange);
-    QApplication::sendEvent(q, &e);
+    QCoreApplication::sendEvent(q, &e);
 }
 
 void QGraphicsWidgetPrivate::resolveLayoutDirection()
@@ -232,9 +226,9 @@ void QGraphicsWidgetPrivate::resolveLayoutDirection()
     } else if (scene) {
         // ### shouldn't the scene have a layoutdirection really? how does
         // ### QGraphicsWidget get changes from QApplication::layoutDirection?
-        setLayoutDirection_helper(QApplication::layoutDirection());
+        setLayoutDirection_helper(QGuiApplication::layoutDirection());
     } else {
-        setLayoutDirection_helper(QApplication::layoutDirection());
+        setLayoutDirection_helper(QGuiApplication::layoutDirection());
     }
 }
 
@@ -296,7 +290,7 @@ void QGraphicsWidgetPrivate::updateFont(const QFont &font)
         return;
     // Notify change.
     QEvent event(QEvent::FontChange);
-    QApplication::sendEvent(q, &event);
+    QCoreApplication::sendEvent(q, &event);
 }
 
 QFont QGraphicsWidgetPrivate::naturalWidgetFont() const
@@ -372,8 +366,8 @@ void QGraphicsWidgetPrivate::windowFrameMouseReleaseEvent(QGraphicsSceneMouseEve
             bar.rect.setHeight(q->style()->pixelMetric(QStyle::PM_TitleBarHeight, &bar));
             QPointF pos = event->pos();
             if (windowFrameMargins) {
-                pos.rx() += windowFrameMargins[Left];
-                pos.ry() += windowFrameMargins[Top];
+                pos.rx() += windowFrameMargins->left();
+                pos.ry() += windowFrameMargins->top();
             }
             bar.subControls = QStyle::SC_TitleBarCloseButton;
             if (q->style()->subControlRect(QStyle::CC_TitleBar, &bar,
@@ -669,8 +663,8 @@ void QGraphicsWidgetPrivate::windowFrameHoverMoveEvent(QGraphicsSceneHoverEvent
     QStyleOptionTitleBar bar;
     // make sure that the coordinates (rect and pos) we send to the style are positive.
     if (windowFrameMargins) {
-        pos.rx() += windowFrameMargins[Left];
-        pos.ry() += windowFrameMargins[Top];
+        pos.rx() += windowFrameMargins->left();
+        pos.ry() += windowFrameMargins->top();
     }
     initStyleOptionTitleBar(&bar);
     bar.rect = q->windowFrameRect().toRect();