Merge remote-tracking branch 'origin/dev' into wip/cmake

Take 5.

Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3

4 files changed, 23 insertions, 23 deletions

diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
index b960ca9220..3a4493474b 100644
--- a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
@@ -309,7 +309,8 @@ bool QtTestModel::moveColumns(const QModelIndex &sourceParent, int src, int cnt,
 
 void QtTestModel::reset()
 {
-    QAbstractItemModel::reset();
+    QAbstractItemModel::beginResetModel();
+    QAbstractItemModel::endResetModel();
 }
 
 bool QtTestModel::canDropMimeData(const QMimeData *data, Qt::DropAction action,
@@ -1785,13 +1786,12 @@ class ModelWithCustomRole : public QStringListModel
 {
   Q_OBJECT
 public:
-  ModelWithCustomRole(QObject *parent = 0)
-    : QStringListModel(parent)
-  {
-    QHash<int, QByteArray> roleNames_ = roleNames();
-    roleNames_.insert(Qt::UserRole + 1, "custom");
-    setRoleNames(roleNames_);
-  }
+    using QStringListModel::QStringListModel;
+
+    QHash<int, QByteArray> roleNames() const override
+    {
+        return {{Qt::UserRole + 1, QByteArrayLiteral("custom")}};
+    }
 };
 
 ListenerObject::ListenerObject(QAbstractProxyModel *parent)
diff --git a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
index 886941bff6..adb93b7a75 100644
--- a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
@@ -313,11 +313,12 @@ public:
         CustomRole2
     };
 
-    StandardItemModelWithCustomRoleNames() {
-        QHash<int, QByteArray> _roleNames = roleNames();
-        _roleNames.insert(CustomRole1, "custom1");
-        _roleNames.insert(CustomRole2, "custom2");
-        setRoleNames(_roleNames);
+    QHash<int, QByteArray> roleNames() const override
+    {
+        auto result = QStandardItemModel::roleNames();
+        result.insert(CustomRole1, QByteArrayLiteral("custom1"));
+        result.insert(CustomRole2, QByteArrayLiteral("custom2"));
+        return result;
     }
 };
 
@@ -329,11 +330,10 @@ public:
         AnotherCustomRole2
     };
 
-    AnotherStandardItemModelWithCustomRoleNames() {
-        QHash<int, QByteArray> _roleNames = roleNames();
-        _roleNames.insert(AnotherCustomRole1, "another_custom1");
-        _roleNames.insert(AnotherCustomRole2, "another_custom2");
-        setRoleNames(_roleNames);
+    QHash<int, QByteArray> roleNames() const override
+    {
+        return {{AnotherCustomRole1, QByteArrayLiteral("another_custom1")},
+                {AnotherCustomRole2, QByteArrayLiteral("another_custom2")}};
     }
 };
 
diff --git a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
index 6fbaa28d69..1cc671a917 100644
--- a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
@@ -2211,8 +2211,8 @@ void tst_QItemSelectionModel::childrenDeselectionSignal()
     }
 
     QModelIndex root = model.index(0,0);
-    QModelIndex par = root.child(0,0);
-    QModelIndex sel = par.child(0,0);
+    QModelIndex par = model.index(0, 0, root);
+    QModelIndex sel = model.index(0, 0, par);
 
     QItemSelectionModel selectionModel(&model);
     selectionModel.select(sel, QItemSelectionModel::SelectCurrent);
@@ -2240,9 +2240,9 @@ void tst_QItemSelectionModel::childrenDeselectionSignal()
         }
     }
 
-    sel = model.index(0, 0).child(0, 0);
+    sel = model.index(0, 0, model.index(0, 0));
     selectionModel.select(sel, QItemSelectionModel::Select);
-    QModelIndex sel2 = model.index(1, 0).child(0, 0);
+    QModelIndex sel2 = model.index(0, 0, model.index(1, 0));
     selectionModel.select(sel2, QItemSelectionModel::Select);
 
     QVERIFY(selectionModel.selection().contains(sel));
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
index ccce5a44e5..0f7588a71a 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
@@ -3977,7 +3977,7 @@ void tst_QSortFilterProxyModel::hierarchyFilterInvalidation()
     QTreeView view;
     view.setModel(&proxy);
 
-    view.setCurrentIndex(proxy.index(2, 0).child(0, 0));
+    view.setCurrentIndex(proxy.index(0, 0, proxy.index(2, 0)));
 
     view.show();
     QVERIFY(QTest::qWaitForWindowExposed(&view));