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.h | |
| parent | 9b449045fbd5fd3b58bcaff6cf0c5878cd6e64eb (diff) | |
| parent | ad55613c2648edb67353c3882d1956b54fc323b4 (diff) | |
Merge branch '5.9' into 5.10
Change-Id: I9fe9946ba47f9ef509a861963c83e275a25fffd0
Diffstat (limited to 'src/core/web_event_factory.h')
| -rw-r--r-- | src/core/web_event_factory.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/web_event_factory.h b/src/core/web_event_factory.h index b5e465610..259795c1f 100644 --- a/src/core/web_event_factory.h +++ b/src/core/web_event_factory.h @@ -41,7 +41,9 @@ #define WEB_EVENT_FACTORY_H #include "content/public/browser/native_web_keyboard_event.h" +#ifndef QT_NO_GESTURES #include "third_party/WebKit/public/platform/WebGestureEvent.h" +#endif #include "third_party/WebKit/public/platform/WebMouseEvent.h" #include "third_party/WebKit/public/platform/WebMouseWheelEvent.h" @@ -52,7 +54,9 @@ class QHoverEvent; class QKeyEvent; class QMouseEvent; class QWheelEvent; +#ifndef QT_NO_GESTURES class QNativeGestureEvent; +#endif QT_END_NAMESPACE class WebEventFactory { @@ -60,7 +64,9 @@ class WebEventFactory { public: static blink::WebMouseEvent toWebMouseEvent(QMouseEvent*, double dpiScale); static blink::WebMouseEvent toWebMouseEvent(QHoverEvent*, double dpiScale); +#ifndef QT_NO_GESTURES static blink::WebGestureEvent toWebGestureEvent(QNativeGestureEvent *, double dpiScale); +#endif static blink::WebMouseWheelEvent toWebWheelEvent(QWheelEvent*, double dpiScale); static content::NativeWebKeyboardEvent toWebKeyboardEvent(QKeyEvent*); }; |