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/render_widget_host_view_qt.h | |
| 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/render_widget_host_view_qt.h')
| -rw-r--r-- | src/core/render_widget_host_view_qt.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h index 0779136f0..7b270e2b3 100644 --- a/src/core/render_widget_host_view_qt.h +++ b/src/core/render_widget_host_view_qt.h @@ -173,6 +173,7 @@ public: void windowChanged() override; bool forwardEvent(QEvent *) override; QVariant inputMethodQuery(Qt::InputMethodQuery query) override; + void closePopup() override; // Overridden from content::TextInputManager::Observer void OnUpdateTextInputStateCalled(content::TextInputManager *text_input_manager, RenderWidgetHostViewBase *updated_view, bool did_update_state) override; @@ -187,7 +188,9 @@ public: void handleKeyEvent(QKeyEvent*); void handleWheelEvent(QWheelEvent*); void handleTouchEvent(QTouchEvent*); +#if QT_CONFIG(tabletevent) void handleTabletEvent(QTabletEvent *ev); +#endif #ifndef QT_NO_GESTURES void handleGestureEvent(QNativeGestureEvent *); #endif |