Merge remote-tracking branch 'origin/5.6' into 5.75.7

Change-Id: I8ffa0181ef59a4fcec216f15413171cbc5b1daed

1 files changed, 11 insertions, 11 deletions

diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
index a7358b5cf..ea7ded46b 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
@@ -231,28 +231,28 @@ class QQuickWebViewLegacyPrivate : public QQuickWebViewPrivate {
     Q_DECLARE_PUBLIC(QQuickWebView)
 public:
     QQuickWebViewLegacyPrivate(QQuickWebView* viewport);
-    virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0);
+    void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0) Q_DECL_OVERRIDE;
 
-    virtual void updateViewportSize();
+    void updateViewportSize() Q_DECL_OVERRIDE;
 
-    qreal zoomFactor() const;
-    void setZoomFactor(qreal);
+    qreal zoomFactor() const Q_DECL_OVERRIDE;
+    void setZoomFactor(qreal) Q_DECL_OVERRIDE;
 };
 
 class QQuickWebViewFlickablePrivate : public QQuickWebViewPrivate {
     Q_DECLARE_PUBLIC(QQuickWebView)
 public:
     QQuickWebViewFlickablePrivate(QQuickWebView* viewport);
-    virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0);
+    void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0) Q_DECL_OVERRIDE;
 
-    virtual void onComponentComplete();
+    void onComponentComplete() Q_DECL_OVERRIDE;
 
-    virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&);
-    virtual WebKit::PageViewportController* viewportController() const { return m_pageViewportController.data(); }
-    virtual void updateViewportSize();
+    void didChangeViewportProperties(const WebCore::ViewportAttributes&) Q_DECL_OVERRIDE;
+    WebKit::PageViewportController* viewportController() const Q_DECL_OVERRIDE { return m_pageViewportController.data(); }
+    void updateViewportSize() Q_DECL_OVERRIDE;
 
-    virtual void pageDidRequestScroll(const QPoint& pos);
-    virtual void handleMouseEvent(QMouseEvent*);
+    void pageDidRequestScroll(const QPoint& pos) Q_DECL_OVERRIDE;
+    void handleMouseEvent(QMouseEvent*) Q_DECL_OVERRIDE;
 
 private:
     QScopedPointer<WebKit::PageViewportController> m_pageViewportController;