diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-17 12:51:21 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-17 12:51:21 +0100 |
| commit | 2c6e6b86ef0a6c63297f9d5daa41c294aaf31a9b (patch) | |
| tree | a8bcb1c7cb5aaf8194eab09f8bc56b2659f13ea5 /src/core/web_event_factory.cpp | |
| parent | aa527a2e553bea0514bc088bfc09105703fe87ba (diff) | |
| parent | 819e00f71e37f5230b9b2c2ff756db4cc4cfda5e (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
src/webengine/api/qquickwebengineview_p_p.h
src/webenginewidgets/api/qwebenginepage_p.h
tests/auto/quick/qmltests/data/TestWebEngineView.qml
Change-Id: Id2acc92e8d0364bdaaf5a63ea2d2cb9cd533ade3
Diffstat (limited to 'src/core/web_event_factory.cpp')
| -rw-r--r-- | src/core/web_event_factory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp index 4241a11c2..4fb89d4e6 100644 --- a/src/core/web_event_factory.cpp +++ b/src/core/web_event_factory.cpp @@ -1024,7 +1024,8 @@ static inline double currentTimeForEvent(const QEvent *event) { Q_ASSERT(event); - if (const QInputEvent *inputEvent = static_cast<const QInputEvent *>(event)) { + if (event->type() != QEvent::Leave) { + const QInputEvent *inputEvent = static_cast<const QInputEvent *>(event); if (inputEvent->timestamp()) return static_cast<double>(inputEvent->timestamp()) / 1000; } |