diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-13 14:53:24 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-01-13 14:53:24 +0000 |
| commit | 4bf31a52de2f9c8d049d2fd7410b9cfb88d41168 (patch) | |
| tree | 0c0130fc47a8f8a8b2f846f5e8c0bda8a97e24a8 /src/core/render_widget_host_view_qt.cpp | |
| parent | b8af7d665ba92fbae3ab62b540dc1caed7ec7b00 (diff) | |
| parent | a077399f4c17f57e911334867c918cc6ddeb15fc (diff) | |
Merge "Merge branch '5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/core/render_widget_host_view_qt.cpp')
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 5d4ac72cd..cade9aa8a 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -739,6 +739,10 @@ bool RenderWidgetHostViewQt::forwardEvent(QEvent *event) Focus(); // Fall through. case QEvent::MouseButtonRelease: case QEvent::MouseMove: + // Skip second MouseMove event when a window is being adopted, so that Chromium + // can properly handle further move events. + if (m_adapterClient->isBeingAdopted()) + return false; handleMouseEvent(static_cast<QMouseEvent*>(event)); break; case QEvent::KeyPress: |