From ccc30c7e0d5c940c0ba69e052b9af86e65d229c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Fri, 2 Jun 2023 10:25:47 +0200 Subject: [PATCH] Doc: Fix links to QLayout[Item]::expandingDirections() The method has been named expandingDirections() since the very initial git commit for Qt 4.8 ... So high time to fix the documentation. Change-Id: If5d7189ebbe439bd0b0e95d51e77c08ee52c3471 Reviewed-by: Andreas Eliasson (cherry picked from commit ef7e65e19a0ddf74a0cd72e59a83b9543426322b) Reviewed-by: Qt Cherry-pick Bot --- src/widgets/kernel/qlayout.cpp | 2 +- src/widgets/kernel/qlayoutitem.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widgets/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp index 7639803c8bf..71b641dae39 100644 --- a/src/widgets/kernel/qlayout.cpp +++ b/src/widgets/kernel/qlayout.cpp @@ -1259,7 +1259,7 @@ QLayout::SizeConstraint QLayout::sizeConstraint() const this layout is set to \a r, provided that this layout supports setAlignment(). - The result is derived from sizeHint() and expanding(). It is never + The result is derived from sizeHint() and expandingDirections(). It is never larger than \a r. */ QRect QLayout::alignmentRect(const QRect &r) const diff --git a/src/widgets/kernel/qlayoutitem.cpp b/src/widgets/kernel/qlayoutitem.cpp index eb53a3a1205..246d090828e 100644 --- a/src/widgets/kernel/qlayoutitem.cpp +++ b/src/widgets/kernel/qlayoutitem.cpp @@ -52,7 +52,7 @@ inline static QSize toLayoutItemSize(QWidgetPrivate *priv, const QSize &size) Pure virtual functions are provided to return information about the layout, including, sizeHint(), minimumSize(), maximumSize() - and expanding(). + and expandingDirections(). The layout's geometry can be set and retrieved with setGeometry() and geometry(), and its alignment with setAlignment() and