From 92e75ae5ec628f0902b096d16cd2cc3c29d89e4c Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Thu, 15 Mar 2018 16:34:20 +0100
Subject: QQuickScrollView: inherit QQuickPane

This allows us to remove duplicate properties, and ScrollView gets
Pane's automatic content size calculation, which allows us to remove
the respective QML bindings.

Change-Id: I96ba98c12d0bf294f19b2c2b3617bfc88326bb41
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/quicktemplates2/qquickpane_p_p.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/quicktemplates2/qquickpane_p_p.h')

diff --git a/src/quicktemplates2/qquickpane_p_p.h b/src/quicktemplates2/qquickpane_p_p.h
index 3c94810e..a78ce990 100644
--- a/src/quicktemplates2/qquickpane_p_p.h
+++ b/src/quicktemplates2/qquickpane_p_p.h
@@ -62,8 +62,9 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPanePrivate : public QQuickControlP
 public:
     QQuickPanePrivate();
 
-    QQmlListProperty<QObject> contentData();
-    QQmlListProperty<QQuickItem> contentChildren();
+    virtual QQmlListProperty<QObject> contentData();
+    virtual QQmlListProperty<QQuickItem> contentChildren();
+    virtual QList<QQuickItem *> contentChildItems() const;
 
     QQuickItem *getContentItem() override;
 
-- 
cgit v1.2.3