diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 15:26:34 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 15:51:20 +0200 |
| commit | 5591e821358b9111c79336a66eac4d04bb5811ba (patch) | |
| tree | 4b4c1da4f5ccaead1cf4f487622de1d0b242b0b9 /src/widgets/graphicsview/qgraphicswidget_p.h | |
| parent | e4079eca49adce16e31dac2a18d49d7a55817891 (diff) | |
| parent | ca0c9f82cbf7c8c37acdcbdfdc3fa0c5fc138059 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ide5b3408bfefca410323cf26b810b44c06d3a227
Diffstat (limited to 'src/widgets/graphicsview/qgraphicswidget_p.h')
| -rw-r--r-- | src/widgets/graphicsview/qgraphicswidget_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/widgets/graphicsview/qgraphicswidget_p.h b/src/widgets/graphicsview/qgraphicswidget_p.h index 821f8c73f1..5e0fdb693b 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,8 +80,7 @@ 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 = nullptr); @@ -193,7 +194,7 @@ public: void ensureWindowData(); bool setWindowFrameMargins; - mutable qreal *windowFrameMargins; + mutable std::unique_ptr<QMarginsF> windowFrameMargins; void ensureWindowFrameMargins() const; #ifndef QT_NO_ACTION |