diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-03 07:31:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-03 07:31:53 +0100 |
| commit | b045cf0ab9756a67a5a1037c231199ee9bf2d074 (patch) | |
| tree | 43831df602905b64552cf31a233127bed9904fc8 /src/core/web_event_factory.h | |
| parent | 0bbaf0d5d7b2d406eda57d40370b00fb79cc0aeb (diff) | |
| parent | 7f7af6290a63bdab76855da5866881c8a53f045c (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/3rdparty
Change-Id: Ie6b1922db2269e0e0561022162228a7c8609c9ba
Diffstat (limited to 'src/core/web_event_factory.h')
| -rw-r--r-- | src/core/web_event_factory.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/web_event_factory.h b/src/core/web_event_factory.h index c9ae86a73..ca0f6035f 100644 --- a/src/core/web_event_factory.h +++ b/src/core/web_event_factory.h @@ -70,6 +70,7 @@ public: static blink::WebGestureEvent toWebGestureEvent(QNativeGestureEvent *, double dpiScale); #endif static blink::WebMouseWheelEvent toWebWheelEvent(QWheelEvent*, double dpiScale); + static bool coalesceWebWheelEvent(blink::WebMouseWheelEvent &, QWheelEvent*, double dpiScale); static content::NativeWebKeyboardEvent toWebKeyboardEvent(QKeyEvent*); }; |