diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-29 09:44:38 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-29 09:44:38 +0100 |
| commit | 8a164aa2cd83d728ce620c2b7199ebc6222b55cb (patch) | |
| tree | e63e01795baafd41e2a65641d21eb00469bed0c5 /src/core/render_widget_host_view_qt.h | |
| parent | 5480a26d2f16dacfbce47da337559b5bcfb3d45e (diff) | |
| parent | f9eb2b95fcdb4df82d3ba8c4aab44347a2bad452 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/core/web_event_factory.cpp
src/core/web_event_factory.h
src/webengine/render_widget_host_view_qt_delegate_quick.h
Change-Id: Ic43787e2689c81b501ed395a990190eb67d83a2b
Diffstat (limited to 'src/core/render_widget_host_view_qt.h')
| -rw-r--r-- | src/core/render_widget_host_view_qt.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h index c896cf058..1ac32456a 100644 --- a/src/core/render_widget_host_view_qt.h +++ b/src/core/render_widget_host_view_qt.h @@ -278,6 +278,8 @@ private: bool m_wheelAckPending; QList<blink::WebMouseWheelEvent> m_pendingWheelEvents; + + std::string m_editCommand; }; } // namespace QtWebEngineCore |