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:08 +0100 |
| commit | ad4ef9836c3142e13a4dc125832a7f0adb5b5d0e (patch) | |
| tree | 3e590680d6db678c87436cd252dd9d03d52534fe /src/widgets/widgets | |
| parent | cd200ad7aef1884a5c36528d5c3933c46c86510f (diff) | |
| parent | 512c1febbd9d5b8af767b2604d6ee97f1fdee4d9 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ib8357609b37b7cc22b51c27602ba60c69bf91da9
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qdockwidget_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/widgets/widgets/qdockwidget_p.h b/src/widgets/widgets/qdockwidget_p.h index bc6ac86c45..e663ec4c2d 100644 --- a/src/widgets/widgets/qdockwidget_p.h +++ b/src/widgets/widgets/qdockwidget_p.h @@ -201,7 +201,11 @@ inline QLayoutItem *QDockWidgetItem::dockWidgetChildItem() const inline QDockWidgetLayout *QDockWidgetItem::dockWidgetLayout() const { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QWidget *w = const_cast<QDockWidgetItem*>(this)->widget(); +#else + QWidget *w = widget(); +#endif if (w != nullptr) return qobject_cast<QDockWidgetLayout*>(w->layout()); return nullptr; |