1 files changed, 8 insertions, 4 deletions
diff --git a/src/widgets/itemviews/qtreeview_p.h b/src/widgets/itemviews/qtreeview_p.h
index 8b217036a2..836d8f0c2d 100644
--- a/src/widgets/itemviews/qtreeview_p.h
+++ b/src/widgets/itemviews/qtreeview_p.h
@@ -53,7 +53,9 @@
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "private/qabstractitemview_p.h"
+#if QT_CONFIG(animation)
 #include <QtCore/qvariantanimation.h>
+#endif
 #include <QtCore/qabstractitemmodel.h>
 #include <QtCore/qvector.h>
 
@@ -85,7 +87,7 @@ public:
 
     QTreeViewPrivate()
         : QAbstractItemViewPrivate(),
-          header(0), indent(20), lastViewedItem(0), defaultItemHeight(-1),
+          header(nullptr), indent(20), lastViewedItem(0), defaultItemHeight(-1),
           uniformRowHeights(false), rootDecoration(true),
           itemsExpandable(true), sortingEnabled(false),
           expandsOnDoubleClick(true),
@@ -105,7 +107,7 @@ public:
     QItemViewPaintPairs draggablePaintPairs(const QModelIndexList &indexes, QRect *r) const override;
     void adjustViewOptionsForIndex(QStyleOptionViewItem *option, const QModelIndex &current) const override;
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     struct AnimatedOperation : public QVariantAnimation
     {
         int item;
@@ -123,7 +125,7 @@ public:
     void drawAnimatedOperation(QPainter *painter) const;
     QPixmap renderTreeToPixmapForAnimation(const QRect &rect) const;
     void _q_endAnimatedOperation();
-#endif //QT_NO_ANIMATION
+#endif // animation
 
     void expand(int item, bool emitSignal);
     void collapse(int item, bool emitSignal);
@@ -138,6 +140,8 @@ public:
 
     int pageUp(int item) const;
     int pageDown(int item) const;
+    int itemForKeyHome() const;
+    int itemForKeyEnd() const;
 
     int itemHeight(int item) const;
     int indentationForItem(int item) const;
@@ -153,7 +157,7 @@ public:
     bool checkViewItems() const;
 #endif
 
-    int firstVisibleItem(int *offset = 0) const;
+    int firstVisibleItem(int *offset = nullptr) const;
     int lastVisibleItem(int firstVisual = -1, int offset = -1) const;
     int columnAt(int x) const;
     bool hasVisibleChildren( const QModelIndex& parent) const;