summaryrefslogtreecommitdiffstats
path: root/src/widgets/accessible/itemviews_p.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-23 07:12:07 +0100
committerLiang Qi <liang.qi@qt.io>2016-11-23 09:24:36 +0100
commit38c1057f696c4e3f168305091413428d99007c43 (patch)
tree49c3ef009cc723151298bfc9eef85bb6fa5910be /src/widgets/accessible/itemviews_p.h
parent48d7db6b3119ee27d9ae6b1bd0fdb24333f44756 (diff)
parente2b856d56290e9b3eaaf889b3e0a08badbaa6046 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
This also reverts commit 0d2f0164f45cb626c40a7c95026ba00fa56ac249. Conflicts: header.BSD-NEW qmake/Makefile.win32 src/openglextensions/qopenglextensions.cpp src/openglextensions/qopenglextensions.h src/winmain/qtmain_win.cpp src/winmain/qtmain_winrt.cpp tools/configure/configureapp.cpp util/glgen/qopenglextensions.cpp.header util/glgen/qopenglextensions.h.header Change-Id: If26c6f4111b342378dd88bbdc657e322d2ab6ad8
Diffstat (limited to 'src/widgets/accessible/itemviews_p.h')
-rw-r--r--src/widgets/accessible/itemviews_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/accessible/itemviews_p.h b/src/widgets/accessible/itemviews_p.h
index 95a0032139..3e2fb1d391 100644
--- a/src/widgets/accessible/itemviews_p.h
+++ b/src/widgets/accessible/itemviews_p.h
@@ -213,7 +213,7 @@ private:
QHeaderView *verticalHeader() const;
QHeaderView *horizontalHeader() const;
QPointer<QAbstractItemView > view;
- QModelIndex m_index;
+ QPersistentModelIndex m_index;
QAccessible::Role m_role;
void selectCell();