diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-05 08:58:48 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-05 08:58:48 +0200 |
| commit | 69ef0481fc22ec3f0d7fa220a47a27fecf76a710 (patch) | |
| tree | f6d96cc257fcb27e12151f079c583251df4c4720 /src/widgets/itemviews/qabstractitemview.h | |
| parent | dbfd7f304c4d91096e104ec2383d92a37502d836 (diff) | |
| parent | 91a2c8630b2204831566ab8e523c747f9d8ec927 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
Change-Id: I6f3878b204464313aa2f9d988d3b35121d4d9867
Diffstat (limited to 'src/widgets/itemviews/qabstractitemview.h')
| -rw-r--r-- | src/widgets/itemviews/qabstractitemview.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h index b8d386f234..4741833654 100644 --- a/src/widgets/itemviews/qabstractitemview.h +++ b/src/widgets/itemviews/qabstractitemview.h @@ -45,6 +45,9 @@ #include <QtCore/qitemselectionmodel.h> #include <QtWidgets/qabstractitemdelegate.h> +class tst_QAbstractItemView; +class tst_QTreeView; + QT_BEGIN_NAMESPACE @@ -367,6 +370,8 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_scrollerStateChanged()) #endif + friend class ::tst_QAbstractItemView; + friend class ::tst_QTreeView; friend class QTreeViewPrivate; // needed to compile with MSVC friend class QListModeViewBase; friend class QListViewPrivate; |