diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-29 01:01:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-29 01:01:19 +0100 |
| commit | 3de89e57c9640ef9d476130abc4cca9120d3ef8c (patch) | |
| tree | 626efeaa3a00581f0f18cf01f9917a1c0058ebe0 /src/widgets/kernel/qlayoutitem.cpp | |
| parent | 02fb4e8f0da24aee81820adb283bb9a1bb8f0688 (diff) | |
| parent | ad4ef9836c3142e13a4dc125832a7f0adb5b5d0e (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/widgets/kernel/qlayoutitem.cpp')
| -rw-r--r-- | src/widgets/kernel/qlayoutitem.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/widgets/kernel/qlayoutitem.cpp b/src/widgets/kernel/qlayoutitem.cpp index ca5a89e4dc..fc02afb014 100644 --- a/src/widgets/kernel/qlayoutitem.cpp +++ b/src/widgets/kernel/qlayoutitem.cpp @@ -291,14 +291,12 @@ void QSpacerItem::changeSize(int w, int h, QSizePolicy::Policy hPolicy, /*! Destructor. */ -QWidgetItem::~QWidgetItem() {} +QWidgetItem::~QWidgetItem() = default; /*! Destroys the QLayoutItem. */ -QLayoutItem::~QLayoutItem() -{ -} +QLayoutItem::~QLayoutItem() = default; /*! Invalidates any cached information in this layout item. @@ -362,7 +360,11 @@ QSpacerItem * QSpacerItem::spacerItem() \sa layout(), spacerItem() */ +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QWidget *QLayoutItem::widget() +#else +QWidget *QLayoutItem::widget() const +#endif { return nullptr; } @@ -370,7 +372,11 @@ QWidget *QLayoutItem::widget() /*! Returns the widget managed by this item. */ +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QWidget *QWidgetItem::widget() +#else +QWidget *QWidgetItem::widget() const +#endif { return wid; } |