diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-06 11:40:41 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-06 12:57:21 +0200 |
| commit | ecb537e8233c8847d14f36ec3bf698711d6d151a (patch) | |
| tree | f9cb367d6e66067970102ed1864f7280f3750ccc /src/core/web_event_factory.cpp | |
| parent | 9b449045fbd5fd3b58bcaff6cf0c5878cd6e64eb (diff) | |
| parent | ad55613c2648edb67353c3882d1956b54fc323b4 (diff) | |
Merge branch '5.9' into 5.10
Change-Id: I9fe9946ba47f9ef509a861963c83e275a25fffd0
Diffstat (limited to 'src/core/web_event_factory.cpp')
| -rw-r--r-- | src/core/web_event_factory.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp index 7f164d6bd..0ae71114b 100644 --- a/src/core/web_event_factory.cpp +++ b/src/core/web_event_factory.cpp @@ -1213,6 +1213,7 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QHoverEvent *ev, double dpiScale) return webKitEvent; } +#ifndef QT_NO_GESTURES WebGestureEvent WebEventFactory::toWebGestureEvent(QNativeGestureEvent *ev, double dpiScale) { WebGestureEvent webKitEvent; @@ -1249,6 +1250,7 @@ WebGestureEvent WebEventFactory::toWebGestureEvent(QNativeGestureEvent *ev, doub return webKitEvent; } +#endif blink::WebMouseWheelEvent WebEventFactory::toWebWheelEvent(QWheelEvent *ev, double dpiScale) { |