diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:45:33 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-15 15:41:16 +0100 |
commit | 5d3adf10341e1882b9c18f71591f9eb037a5f91d (patch) | |
tree | eaff30c95ed32c103d22dbb803bbddfa29bd6be2 /src/core/web_event_factory.h | |
parent | cf6768d81ed7b9444e28ede6e26e125d5919b143 (diff) | |
parent | 61eb7b4ff6e4f2de5b5df6d7a76191cbf8dd9312 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/3rdparty
tests/auto/quick/qmltests/qmltests.pro
tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
Change-Id: I2a1e3a83e29a1d6709f3e98fda3f7b4ab7ab297e
Diffstat (limited to 'src/core/web_event_factory.h')
-rw-r--r-- | src/core/web_event_factory.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/web_event_factory.h b/src/core/web_event_factory.h index f4ce417cd..5b8f08968 100644 --- a/src/core/web_event_factory.h +++ b/src/core/web_event_factory.h @@ -50,6 +50,7 @@ #include <QtGlobal> QT_BEGIN_NAMESPACE +class QEvent; class QHoverEvent; class QKeyEvent; class QMouseEvent; @@ -64,6 +65,7 @@ class WebEventFactory { public: static blink::WebMouseEvent toWebMouseEvent(QMouseEvent*, double dpiScale); static blink::WebMouseEvent toWebMouseEvent(QHoverEvent*, double dpiScale); + static blink::WebMouseEvent toWebMouseEvent(QEvent *); #ifndef QT_NO_GESTURES static blink::WebGestureEvent toWebGestureEvent(QNativeGestureEvent *, double dpiScale); #endif |