Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	.qmake.conf
	src/core/api/qwebengineurlrequestjob.cpp
	src/core/browser_context_adapter.cpp
	src/core/renderer/user_resource_controller.cpp
	src/core/web_engine_context.cpp
	src/webenginewidgets/api/qwebenginepage.cpp

Change-Id: I5278e5e22e1776d42975fc94d70ff8ca4f81fb9a

1 files changed, 2 insertions, 1 deletions

diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp
index 3193f885a..359eb5a58 100644
--- a/src/core/web_event_factory.cpp
+++ b/src/core/web_event_factory.cpp
@@ -1023,7 +1023,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;
     }