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/WebKit/qt/WidgetApi/qwebframe.h | |
| parent | b9ce7cfc7f14b96b0b573f56f792fb3a55ac60f9 (diff) | |
| parent | ed84b8b4ff88c5affaa89edb72e6aaf481f3ccc1 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Change-Id: I8ffa0181ef59a4fcec216f15413171cbc5b1daed
Diffstat (limited to 'Source/WebKit/qt/WidgetApi/qwebframe.h')
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebframe.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.h b/Source/WebKit/qt/WidgetApi/qwebframe.h index 619594336..1c3cb07c3 100644 --- a/Source/WebKit/qt/WidgetApi/qwebframe.h +++ b/Source/WebKit/qt/WidgetApi/qwebframe.h @@ -202,7 +202,7 @@ public: QWebHitTestResult hitTestContent(const QPoint &pos) const; - virtual bool event(QEvent *); + bool event(QEvent *) Q_DECL_OVERRIDE; QWebSecurityOrigin securityOrigin() const; QWebFrameAdapter* handle() const; |