summaryrefslogtreecommitdiffstats
path: root/examples/widgets/layouts/flowlayout/flowlayout.cpp
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-02-09 18:43:05 +0100
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-02-13 05:55:46 +0000
commit8cba096c2aa181b93887fa6f6086dee689dbf5ca (patch)
tree911a18b3f9625aecc79e46e33dbf7d15d6f08f07 /examples/widgets/layouts/flowlayout/flowlayout.cpp
parentd493f676a38f000dd9c22dee6eea2b5ae4291e0a (diff)
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 <Friedemann.Kleint@qt.io>
Diffstat (limited to 'examples/widgets/layouts/flowlayout/flowlayout.cpp')
-rw-r--r--examples/widgets/layouts/flowlayout/flowlayout.cpp3
1 files changed, 2 insertions, 1 deletions
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]