From ce7447d88ce5f410ae01b0f5697a86b3ba7c47f2 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sat, 21 Sep 2019 15:25:11 +0200 Subject: QLayoutItem: make QLayoutItem::widget() const in Qt6 QLayoutItem::widget() should be const since it does not modify the class. Since this can not be done within Qt5 in a binary compatible way, change it for Qt6. Fixes: QTBUG-41997 Change-Id: I9211eb1c36a5bc4f06ab417a9df790ebedb7fcda Reviewed-by: Friedemann Kleint Reviewed-by: Richard Moe Gustavsen --- src/widgets/widgets/qdockwidget_p.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/widgets/widgets') 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(this)->widget(); +#else + QWidget *w = widget(); +#endif if (w != nullptr) return qobject_cast(w->layout()); return nullptr; -- cgit v1.2.3