1 files changed, 14 insertions, 1 deletions
diff --git a/src/quicktemplates/qquickheaderview_p_p.h b/src/quicktemplates/qquickheaderview_p_p.h
index fe33cb0190..63abd58aa3 100644
--- a/src/quicktemplates/qquickheaderview_p_p.h
+++ b/src/quicktemplates/qquickheaderview_p_p.h
@@ -25,7 +25,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QHeaderDataProxyModel : public QAbstractItemModel
+class Q_QUICKTEMPLATES2_EXPORT QHeaderDataProxyModel : public QAbstractItemModel
 {
     Q_OBJECT
     Q_DISABLE_COPY(QHeaderDataProxyModel)
@@ -44,11 +44,14 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
     bool hasChildren(const QModelIndex &parent = QModelIndex()) const override;
+    QHash<int, QByteArray> roleNames() const override;
 
     inline QVariant variantValue() const;
     inline Qt::Orientation orientation() const;
     inline void setOrientation(Qt::Orientation o);
 
+    QQuickHeaderViewBase *m_headerView = nullptr;
+
 private:
     inline void connectToModel();
     inline void disconnectFromModel();
@@ -70,6 +73,7 @@ public:
     void setModelImpl(const QVariant &newModel) override;
     void syncModel() override;
     void syncSyncView() override;
+    QAbstractItemModel *selectionSourceModel() override;
 
 protected:
     QHeaderDataProxyModel m_headerDataProxyModel;
@@ -84,6 +88,11 @@ protected:
     QStack<SectionSize> m_hiddenSectionSizes;
     bool m_modelExplicitlySetByUser = false;
     QString m_textRole;
+
+    int logicalRowIndex(const int visualIndex) const final;
+    int logicalColumnIndex(const int visualIndex) const final;
+    int visualRowIndex(const int logicalIndex) const final;
+    int visualColumnIndex(const int logicalIndex) const final;
 };
 
 class QQuickHorizontalHeaderViewPrivate : public QQuickHeaderViewBasePrivate
@@ -92,6 +101,8 @@ class QQuickHorizontalHeaderViewPrivate : public QQuickHeaderViewBasePrivate
 public:
     QQuickHorizontalHeaderViewPrivate();
     ~QQuickHorizontalHeaderViewPrivate();
+
+    bool m_movableColumns = false;
 };
 
 class QQuickVerticalHeaderViewPrivate : public QQuickHeaderViewBasePrivate
@@ -100,6 +111,8 @@ class QQuickVerticalHeaderViewPrivate : public QQuickHeaderViewBasePrivate
 public:
     QQuickVerticalHeaderViewPrivate();
     ~QQuickVerticalHeaderViewPrivate();
+
+    bool m_movableRows = false;
 };
 
 QT_END_NAMESPACE