diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2018-08-20 16:26:03 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-21 15:18:19 +0200 |
| commit | be18c1dcfa68328acdf11e0a534749d9a5d75f8b (patch) | |
| tree | 53a7b347d2771f4502338ac973a80a37edacdee7 /src/core/web_event_factory.cpp | |
| parent | b74e93a9b07243da4f3d2784cde49916de455364 (diff) | |
| parent | e56dd7e37ea96c4ba1354e319bdaa9d01c401747 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
configure.json
examples/webenginewidgets/markdowneditor/resources/3rdparty/marked.js
examples/webenginewidgets/markdowneditor/resources/3rdparty/qt_attribution.json
examples/webenginewidgets/markdowneditor/resources/markdowneditor.qrc
mkspecs/features/platform.prf
src/3rdparty
src/core/media_capture_devices_dispatcher.cpp
src/core/net/url_request_context_getter_qt.cpp
src/core/net/url_request_context_getter_qt.h
src/core/web_contents_adapter.cpp
Change-Id: I467133ba455b1f85f6bb61793794c31cb1094541
Diffstat (limited to 'src/core/web_event_factory.cpp')
| -rw-r--r-- | src/core/web_event_factory.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp index b8e8b1689..a1fd3e55b 100644 --- a/src/core/web_event_factory.cpp +++ b/src/core/web_event_factory.cpp @@ -76,7 +76,9 @@ #include <QKeyEvent> #include <QMouseEvent> #include <QStyleHints> +#if QT_CONFIG(tabletevent) #include <QTabletEvent> +#endif #include <QWheelEvent> using namespace blink; @@ -1186,6 +1188,7 @@ static WebInputEvent::Type webEventTypeForEvent(const QEvent* event) } } +#if QT_CONFIG(tabletevent) static WebPointerProperties::PointerType pointerTypeForTabletEvent(const QTabletEvent *ev) { switch (ev->pointerType()) { @@ -1199,6 +1202,7 @@ static WebPointerProperties::PointerType pointerTypeForTabletEvent(const QTablet return WebPointerProperties::PointerType::kMouse; } } +#endif WebMouseEvent WebEventFactory::toWebMouseEvent(QMouseEvent *ev, double dpiScale) { @@ -1230,6 +1234,7 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QHoverEvent *ev, double dpiScale) return webKitEvent; } +#if QT_CONFIG(tabletevent) WebMouseEvent WebEventFactory::toWebMouseEvent(QTabletEvent *ev, double dpiScale) { WebMouseEvent webKitEvent(webEventTypeForEvent(ev), @@ -1248,6 +1253,7 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QTabletEvent *ev, double dpiScale webKitEvent.pointer_type = pointerTypeForTabletEvent(ev); return webKitEvent; } +#endif WebMouseEvent WebEventFactory::toWebMouseEvent(QEvent *ev) { |