Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp

Change-Id: I6f3878b204464313aa2f9d988d3b35121d4d9867

1 files changed, 3 insertions, 0 deletions

diff --git a/src/widgets/itemviews/qtreeview.h b/src/widgets/itemviews/qtreeview.h
index 6fd6799b7e..d7166a3b33 100644
--- a/src/widgets/itemviews/qtreeview.h
+++ b/src/widgets/itemviews/qtreeview.h
@@ -42,6 +42,8 @@
 
 #include <QtWidgets/qabstractitemview.h>
 
+class tst_QTreeView;
+
 QT_BEGIN_NAMESPACE
 
 
@@ -219,6 +221,7 @@ protected:
     void currentChanged(const QModelIndex &current, const QModelIndex &previous) Q_DECL_OVERRIDE;
 
 private:
+    friend class ::tst_QTreeView;
     friend class QAccessibleTable;
     friend class QAccessibleTree;
     friend class QAccessibleTableCell;