From 8cba096c2aa181b93887fa6f6086dee689dbf5ca Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sat, 9 Feb 2019 18:43:05 +0100 Subject: QtBase: compile examples with QT_DISABLE_DEPRECATED_BEFORE=0x050d00 Replace deprecated functions to be able to compile examples with QT_DISABLE_DEPRECATED_BEFORE=0x050d00 Change-Id: If6b8de31f526320d6a0e2a20bb5f8e26c77f2353 Reviewed-by: Friedemann Kleint --- examples/widgets/layouts/flowlayout/flowlayout.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'examples/widgets/layouts/flowlayout') diff --git a/examples/widgets/layouts/flowlayout/flowlayout.cpp b/examples/widgets/layouts/flowlayout/flowlayout.cpp index 53613b8b20..5c59ae025c 100644 --- a/examples/widgets/layouts/flowlayout/flowlayout.cpp +++ b/examples/widgets/layouts/flowlayout/flowlayout.cpp @@ -158,7 +158,8 @@ QSize FlowLayout::minimumSize() const for (const QLayoutItem *item : qAsConst(itemList)) size = size.expandedTo(item->minimumSize()); - size += QSize(2*margin(), 2*margin()); + const QMargins margins = contentsMargins(); + size += QSize(margins.left() + margins.right(), margins.top() + margins.bottom()); return size; } //! [8] -- cgit v1.2.3