Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 5 insertions, 4 deletions

diff --git a/examples/widgets/itemviews/simpledommodel/mainwindow.cpp b/examples/widgets/itemviews/simpledommodel/mainwindow.cpp
index 7d43d0fc02..86543b07a6 100644
--- a/examples/widgets/itemviews/simpledommodel/mainwindow.cpp
+++ b/examples/widgets/itemviews/simpledommodel/mainwindow.cpp
@@ -48,22 +48,23 @@
 **
 ****************************************************************************/
 
-#include "dommodel.h"
 #include "mainwindow.h"
+#include "dommodel.h"
 
 #include <QDomDocument>
 #include <QTreeView>
 #include <QMenuBar>
 #include <QFileDialog>
 
-MainWindow::MainWindow() : QMainWindow(), model(0)
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent),
+      model(new DomModel(QDomDocument(), this)),
+      view(new QTreeView(this))
 {
     fileMenu = menuBar()->addMenu(tr("&File"));
     fileMenu->addAction(tr("&Open..."), this, &MainWindow::openFile, QKeySequence::Open);
     fileMenu->addAction(tr("E&xit"), this, &QWidget::close, QKeySequence::Quit);
 
-    model = new DomModel(QDomDocument(), this);
-    view = new QTreeView(this);
     view->setModel(model);
 
     setCentralWidget(view);