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 <richard.gustavsen@qt.io>

3 files changed, 8 insertions, 4 deletions

diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h
index 1bd8fc1020..57cc2533a0 100644
--- a/src/quick/items/qquickflickable_p.h
+++ b/src/quick/items/qquickflickable_p.h
@@ -117,7 +117,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickFlickable : public QQuickItem
 
 public:
     QQuickFlickable(QQuickItem *parent=nullptr);
-    ~QQuickFlickable();
+    ~QQuickFlickable() override;
 
     QQmlListProperty<QObject> flickableData();
     QQmlListProperty<QQuickItem> flickableChildren();
diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index 4b13cde2d5..db2c4ae7d3 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -1772,6 +1772,10 @@ QQuickTableView::QQuickTableView(QQuickItem *parent)
     setFlag(QQuickItem::ItemIsFocusScope);
 }
 
+QQuickTableView::~QQuickTableView()
+{
+}
+
 QQuickTableView::QQuickTableView(QQuickTableViewPrivate &dd, QQuickItem *parent)
     : QQuickFlickable(dd, parent)
 {
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 *);