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

Change-Id: I843994939f126ced22f7fe978ec4403f599fc7c9

1 files changed, 6 insertions, 0 deletions

diff --git a/src/widgets/accessible/itemviews_p.h b/src/widgets/accessible/itemviews_p.h
index ed421d3146..5b73444c67 100644
--- a/src/widgets/accessible/itemviews_p.h
+++ b/src/widgets/accessible/itemviews_p.h
@@ -145,6 +145,7 @@ private:
     QAccessible::Role m_role;
 };
 
+#ifndef QT_NO_TREEVIEW
 class QAccessibleTree :public QAccessibleTable
 {
 public:
@@ -172,6 +173,7 @@ private:
 
     inline int logicalIndex(const QModelIndex &index) const;
 };
+#endif
 
 class QAccessibleTableCell: public QAccessibleInterface, public QAccessibleTableCellInterface, public QAccessibleActionInterface
 {
@@ -221,7 +223,9 @@ private:
     void unselectCell();
 
 friend class QAccessibleTable;
+#ifndef QT_NO_TREEVIEW
 friend class QAccessibleTree;
+#endif
 };
 
 
@@ -255,7 +259,9 @@ private:
     Qt::Orientation orientation;
 
 friend class QAccessibleTable;
+#ifndef QT_NO_TREEVIEW
 friend class QAccessibleTree;
+#endif
 };
 
 // This is the corner button on the top left of a table.