diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-25 08:53:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-25 08:54:41 +0100 |
| commit | bb9f65f54ee866eced8e157b59e64d05a52aa3a5 (patch) | |
| tree | 07898105fe79caed5fa3bbdbb9d6752ee6928c0f /Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h | |
| parent | b9ce7cfc7f14b96b0b573f56f792fb3a55ac60f9 (diff) | |
| parent | ed84b8b4ff88c5affaa89edb72e6aaf481f3ccc1 (diff) | |
| download | qtwebkit-5.7.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Change-Id: I8ffa0181ef59a4fcec216f15413171cbc5b1daed
Diffstat (limited to 'Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h index 1daf5db0a..c06f8f219 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h @@ -136,7 +136,7 @@ public: bool canGoForward() const; bool loading() const; - virtual QVariant inputMethodQuery(Qt::InputMethodQuery property) const; + QVariant inputMethodQuery(Qt::InputMethodQuery property) const Q_DECL_OVERRIDE; QPointF mapToWebContent(const QPointF&) const; QRectF mapRectToWebContent(const QRectF&) const; @@ -177,28 +177,28 @@ Q_SIGNALS: void navigationRequested(QWebNavigationRequest* request); protected: - virtual bool childMouseEventFilter(QQuickItem*, QEvent*); - virtual void geometryChanged(const QRectF&, const QRectF&); - virtual void componentComplete(); - virtual void keyPressEvent(QKeyEvent*); - virtual void keyReleaseEvent(QKeyEvent*); - virtual void inputMethodEvent(QInputMethodEvent*); - virtual void focusInEvent(QFocusEvent*); - virtual void itemChange(ItemChange change, const ItemChangeData &value); - virtual void touchEvent(QTouchEvent*); - virtual void mousePressEvent(QMouseEvent*); - virtual void mouseMoveEvent(QMouseEvent*); - virtual void mouseReleaseEvent(QMouseEvent *); - virtual void mouseDoubleClickEvent(QMouseEvent*); - virtual void wheelEvent(QWheelEvent*); - virtual void hoverEnterEvent(QHoverEvent*); - virtual void hoverMoveEvent(QHoverEvent*); - virtual void hoverLeaveEvent(QHoverEvent*); - virtual void dragMoveEvent(QDragMoveEvent*); - virtual void dragEnterEvent(QDragEnterEvent*); - virtual void dragLeaveEvent(QDragLeaveEvent*); - virtual void dropEvent(QDropEvent*); - virtual bool event(QEvent*); + bool childMouseEventFilter(QQuickItem*, QEvent*) Q_DECL_OVERRIDE; + void geometryChanged(const QRectF&, const QRectF&) Q_DECL_OVERRIDE; + void componentComplete() Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE; + void keyReleaseEvent(QKeyEvent*) Q_DECL_OVERRIDE; + void inputMethodEvent(QInputMethodEvent*) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent*) Q_DECL_OVERRIDE; + void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; + void touchEvent(QTouchEvent*) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent*) Q_DECL_OVERRIDE; + void mouseMoveEvent(QMouseEvent*) Q_DECL_OVERRIDE; + void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(QMouseEvent*) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent*) Q_DECL_OVERRIDE; + void hoverEnterEvent(QHoverEvent*) Q_DECL_OVERRIDE; + void hoverMoveEvent(QHoverEvent*) Q_DECL_OVERRIDE; + void hoverLeaveEvent(QHoverEvent*) Q_DECL_OVERRIDE; + void dragMoveEvent(QDragMoveEvent*) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent*) Q_DECL_OVERRIDE; + void dragLeaveEvent(QDragLeaveEvent*) Q_DECL_OVERRIDE; + void dropEvent(QDropEvent*) Q_DECL_OVERRIDE; + bool event(QEvent*) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QQuickWebView) |