diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-03-15 16:34:20 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-05 13:59:44 +0000 |
| commit | 92e75ae5ec628f0902b096d16cd2cc3c29d89e4c (patch) | |
| tree | aa9a66d479bfee8973424d33191a073950bc03de /src/quicktemplates2/qquickpane_p_p.h | |
| parent | 3c4942f12fd33e91973cfa55aef8d675f4e32126 (diff) | |
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>
Diffstat (limited to 'src/quicktemplates2/qquickpane_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickpane_p_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
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; |