Layouts docs: pass parent widget in the ctor

This is a follow up from commit 1e904ab342c1aaa; changing more
documentation to pass a widget * in the ctor of a layout, rather
than creating a parent-less layout then calling setLayout().

Change-Id: I4fc59c6cfa46ccd279a153acd67335a6daf22ff9
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>

2 files changed, 6 insertions, 9 deletions

diff --git a/src/corelib/doc/snippets/fileinfo/main.cpp b/src/corelib/doc/snippets/fileinfo/main.cpp
index da6a2798f6..819bde3de5 100644
--- a/src/corelib/doc/snippets/fileinfo/main.cpp
+++ b/src/corelib/doc/snippets/fileinfo/main.cpp
@@ -31,14 +31,16 @@ int main(int argc, char *argv[])
     qDebug() << fileInfo5.fileName();
     qDebug() << fileInfo6.fileName();
 
+    QGroupBox *groupBox = new QGroupBox(QStringLiteral("QFileInfo::dir() test"));
+
+    QVBoxLayout *vbox = new QVBoxLayout(groupBox);
+
     QPushButton* button1 = new QPushButton(fileInfo1.dir().path());
     QPushButton* button2 = new QPushButton(fileInfo2.dir().path());
     QPushButton* button3 = new QPushButton(fileInfo3.dir().path());
     QPushButton* button4 = new QPushButton(fileInfo4.dir().path());
     QPushButton* button5 = new QPushButton(fileInfo5.dir().path());
     QPushButton* button6 = new QPushButton(fileInfo6.dir().path());
-
-    QVBoxLayout* vbox = new QVBoxLayout;
     vbox->addWidget(button1);
     vbox->addWidget(button2);
     vbox->addWidget(button3);
@@ -47,8 +49,6 @@ int main(int argc, char *argv[])
     vbox->addWidget(button6);
     vbox->addStretch(1);
 
-    QGroupBox *groupBox = new QGroupBox("QFileInfo::dir() test");
-    groupBox->setLayout(vbox);
     groupBox->show();
 
     return app.exec();
diff --git a/src/corelib/doc/snippets/qsignalmapper/buttonwidget.cpp b/src/corelib/doc/snippets/qsignalmapper/buttonwidget.cpp
index 1d1f2b147c..235d8b27db 100644
--- a/src/corelib/doc/snippets/qsignalmapper/buttonwidget.cpp
+++ b/src/corelib/doc/snippets/qsignalmapper/buttonwidget.cpp
@@ -11,7 +11,7 @@ ButtonWidget::ButtonWidget(const QStringList &texts, QWidget *parent)
 {
     signalMapper = new QSignalMapper(this);
 
-    QGridLayout *gridLayout = new QGridLayout;
+    QGridLayout *gridLayout = new QGridLayout(this);
     for (int i = 0; i < texts.size(); ++i) {
         QPushButton *button = new QPushButton(texts[i]);
         connect(button, &QPushButton::clicked, signalMapper, &QSignalMapper::map);
@@ -23,8 +23,6 @@ ButtonWidget::ButtonWidget(const QStringList &texts, QWidget *parent)
     connect(signalMapper, &QSignalMapper::mappedString,
 //! [1] //! [2]
             this, &ButtonWidget::clicked);
-
-    setLayout(gridLayout);
 }
 //! [2]
 
@@ -32,13 +30,12 @@ ButtonWidget::ButtonWidget(const QStringList &texts, QWidget *parent)
 ButtonWidget::ButtonWidget(const QStringList &texts, QWidget *parent)
     : QWidget(parent)
 {
-    QGridLayout *gridLayout = new QGridLayout;
+    QGridLayout *gridLayout = new QGridLayout(this);
     for (int i = 0; i < texts.size(); ++i) {
         QString text = texts[i];
         QPushButton *button = new QPushButton(text);
         connect(button, &QPushButton::clicked, [this, text] { clicked(text); });
         gridLayout->addWidget(button, i / 3, i % 3);
     }
-    setLayout(gridLayout);
 }
 //! [3]