diff options
author | Ian Walters <ian.walters@nokia.com> | 2009-05-12 00:18:56 (GMT) |
---|---|---|
committer | Ian Walters <ian.walters@nokia.com> | 2009-05-12 00:18:56 (GMT) |
commit | a7d54ce95b9cb1cd923ea202fc7b561792003d0d (patch) | |
tree | ca33410ab469c0f10040260e1d133ba835c1017f /src/gui/itemviews/qabstractitemview_p.h | |
parent | ee533dd0818c3bf7c940cd2d543adb1c6807dd1c (diff) | |
parent | 4af513212d9ca9ed88e18bddaabd90006aca8541 (diff) | |
download | Qt-a7d54ce95b9cb1cd923ea202fc7b561792003d0d.zip Qt-a7d54ce95b9cb1cd923ea202fc7b561792003d0d.tar.gz Qt-a7d54ce95b9cb1cd923ea202fc7b561792003d0d.tar.bz2 |
Merge branch 'master' into contiguouscache
Diffstat (limited to 'src/gui/itemviews/qabstractitemview_p.h')
-rw-r--r-- | src/gui/itemviews/qabstractitemview_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/gui/itemviews/qabstractitemview_p.h index 37fe4a2..139d0b7 100644 --- a/src/gui/itemviews/qabstractitemview_p.h +++ b/src/gui/itemviews/qabstractitemview_p.h @@ -99,7 +99,7 @@ public: QVariant data(const QModelIndex &, int) const { return QVariant(); } }; -class Q_GUI_EXPORT QAbstractItemViewPrivate : public QAbstractScrollAreaPrivate +class QAbstractItemViewPrivate : public QAbstractScrollAreaPrivate { Q_DECLARE_PUBLIC(QAbstractItemView) @@ -359,6 +359,7 @@ public: QBasicTimer autoScrollTimer; int autoScrollMargin; int autoScrollCount; + bool shouldScrollToCurrentOnShow; //used to know if we should scroll to current on show event bool alternatingColors; |