diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-11-01 20:29:59 +0100 |
---|---|---|
committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-11-02 14:25:03 +0100 |
commit | d76b9d86e85ed7c0705209caca40b7a0efc71e14 (patch) | |
tree | 57254eb3b8f7fbb6970858dbb64e0795167e4f69 /src/widgets/kernel/qgridlayout.cpp | |
parent | 3b8d37b1f04acf60ceb144bfa5ed82e72e59a255 (diff) |
QLayout: unify the constructors
Drive-by, make QLayout constructor explicit, as it should have
always been.
[ChangeLog][QtWidgets][QLayout] The QLayout constructor taking
a QWidget pointer is now explicit.
Change-Id: If6accfb2e7e810fa08adacea9e674c99121f6bc6
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/widgets/kernel/qgridlayout.cpp')
-rw-r--r-- | src/widgets/kernel/qgridlayout.cpp | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/widgets/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp index 3a1d89573c..121bae0352 100644 --- a/src/widgets/kernel/qgridlayout.cpp +++ b/src/widgets/kernel/qgridlayout.cpp @@ -1077,6 +1077,10 @@ QRect QGridLayoutPrivate::cellRect(int row, int col) const There can be only one top-level layout for a widget. It is returned by QWidget::layout(). + If \a parent is \nullptr, then you must insert this grid layout + into another layout, or set it as a widget's layout using + QWidget::setLayout(). + \sa QWidget::setLayout() */ QGridLayout::QGridLayout(QWidget *parent) @@ -1087,23 +1091,6 @@ QGridLayout::QGridLayout(QWidget *parent) } /*! - Constructs a new grid layout. - - You must insert this grid into another layout. You can insert - widgets and layouts into this layout at any time, but laying out - will not be performed before this is inserted into another layout. -*/ -QGridLayout::QGridLayout() - : QLayout(*new QGridLayoutPrivate, nullptr, nullptr) -{ - Q_D(QGridLayout); - d->expand(1, 1); -} - - - - -/*! \internal (mostly) Sets the positioning mode used by addItem(). If \a orient is |