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

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 3 insertions, 3 deletions

diff --git a/examples/widgets/itemviews/simpledommodel/domitem.h b/examples/widgets/itemviews/simpledommodel/domitem.h
index b5db16009c..4a74db5139 100644
--- a/examples/widgets/itemviews/simpledommodel/domitem.h
+++ b/examples/widgets/itemviews/simpledommodel/domitem.h
@@ -58,16 +58,16 @@
 class DomItem
 {
 public:
-    DomItem(QDomNode &node, int row, DomItem *parent = 0);
+    DomItem(const QDomNode &node, int row, DomItem *parent = nullptr);
     ~DomItem();
     DomItem *child(int i);
     DomItem *parent();
     QDomNode node() const;
-    int row();
+    int row() const;
 
 private:
     QDomNode domNode;
-    QHash<int,DomItem*> childItems;
+    QHash<int, DomItem *> childItems;
     DomItem *parentItem;
     int rowNumber;
 };