diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-02-09 18:43:05 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-02-13 05:55:46 +0000 |
commit | 8cba096c2aa181b93887fa6f6086dee689dbf5ca (patch) | |
tree | 911a18b3f9625aecc79e46e33dbf7d15d6f08f07 /examples/widgets/layouts | |
parent | d493f676a38f000dd9c22dee6eea2b5ae4291e0a (diff) | |
download | qtbase-8cba096c2aa181b93887fa6f6086dee689dbf5ca.tar.gz |
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')
-rw-r--r-- | examples/widgets/layouts/borderlayout/borderlayout.cpp | 4 | ||||
-rw-r--r-- | examples/widgets/layouts/borderlayout/borderlayout.h | 2 | ||||
-rw-r--r-- | examples/widgets/layouts/flowlayout/flowlayout.cpp | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/examples/widgets/layouts/borderlayout/borderlayout.cpp b/examples/widgets/layouts/borderlayout/borderlayout.cpp index c929d3b2a4..b8ddd3af83 100644 --- a/examples/widgets/layouts/borderlayout/borderlayout.cpp +++ b/examples/widgets/layouts/borderlayout/borderlayout.cpp @@ -50,10 +50,10 @@ #include "borderlayout.h" -BorderLayout::BorderLayout(QWidget *parent, int margin, int spacing) +BorderLayout::BorderLayout(QWidget *parent, const QMargins &margins, int spacing) : QLayout(parent) { - setMargin(margin); + setContentsMargins(margins); setSpacing(spacing); } diff --git a/examples/widgets/layouts/borderlayout/borderlayout.h b/examples/widgets/layouts/borderlayout/borderlayout.h index 4c0c01f90b..58d1aa394d 100644 --- a/examples/widgets/layouts/borderlayout/borderlayout.h +++ b/examples/widgets/layouts/borderlayout/borderlayout.h @@ -59,7 +59,7 @@ class BorderLayout : public QLayout public: enum Position { West, North, South, East, Center }; - explicit BorderLayout(QWidget *parent, int margin = 0, int spacing = -1); + explicit BorderLayout(QWidget *parent, const QMargins &margins = QMargins(), int spacing = -1); BorderLayout(int spacing = -1); ~BorderLayout(); 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] |