From 3ed8744d24032fdaa9c84f32f918a3027cb0420f Mon Sep 17 00:00:00 2001 From: Yulong Bai Date: Tue, 30 Oct 2018 17:01:52 +0100 Subject: QQuickTableView QQuickFlickable: make destructors explicitly override Make destructors explicitly override and virtual. Make QQuickTableView's setModel/model virtual, so that can be overridden for derived classes. Change-Id: Ieabc9add74a4725653a84b39f7e4c00c18a89f1d Reviewed-by: Richard Moe Gustavsen --- src/quick/items/qquicktableview_p.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/quick/items/qquicktableview_p.h') diff --git a/src/quick/items/qquicktableview_p.h b/src/quick/items/qquicktableview_p.h index e18169e346..c5197b4230 100644 --- a/src/quick/items/qquicktableview_p.h +++ b/src/quick/items/qquicktableview_p.h @@ -82,7 +82,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickTableView : public QQuickFlickable public: QQuickTableView(QQuickItem *parent = nullptr); - + ~QQuickTableView() override; int rows() const; int columns() const; @@ -98,8 +98,8 @@ public: QJSValue columnWidthProvider() const; void setColumnWidthProvider(QJSValue provider); - QVariant model() const; - void setModel(const QVariant &newModel); + virtual QVariant model() const; + virtual void setModel(const QVariant &newModel); QQmlComponent *delegate() const; void setDelegate(QQmlComponent *); -- cgit v1.2.3