Merge remote-tracking branch 'origin/dev' into merge-dev

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

2 files changed, 5 insertions, 5 deletions

diff --git a/examples/sql/doc/src/cachedtable.qdoc b/examples/sql/doc/src/cachedtable.qdoc
index 2db80f9c8e..0dd7928e21 100644
--- a/examples/sql/doc/src/cachedtable.qdoc
+++ b/examples/sql/doc/src/cachedtable.qdoc
@@ -43,15 +43,15 @@
 
     \section1 TableEditor Class Definition
 
-    The \c TableEditor class inherits QDialog making the table editor
+    The \c TableEditor class inherits QWidget making the table editor
     widget a top-level dialog window.
 
     \snippet cachedtable/tableeditor.h 0
 
     The \c TableEditor constructor takes two arguments: The first is a
-    pointer to the parent widget and is passed on to the base class
-    constructor. The other is a reference to the database table the \c
-    TableEditor object will operate on.
+    reference to the database table the \c TableEditor object will operate
+    on. The other is a pointer to the parent widget and is passed on to the
+    base class constructor.
 
     Note the QSqlTableModel variable declaration: As we will see in
     this example, the QSqlTableModel class can be used to provide data
diff --git a/examples/sql/masterdetail/mainwindow.cpp b/examples/sql/masterdetail/mainwindow.cpp
index 7f3479619a..2ff9a10d91 100644
--- a/examples/sql/masterdetail/mainwindow.cpp
+++ b/examples/sql/masterdetail/mainwindow.cpp
@@ -320,7 +320,7 @@ QGroupBox* MainWindow::createAlbumGroupBox()
             this, &MainWindow::showAlbumDetails);
 
     QVBoxLayout *layout = new QVBoxLayout;
-    layout->addWidget(albumView, 0, 0);
+    layout->addWidget(albumView, 0, { });
     box->setLayout(layout);
 
     return box;