diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-04 10:36:20 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-04 10:36:20 +0200 |
commit | 1a3b34ea8cfb09dcb9022e897c4b494b623abd6a (patch) | |
tree | b18be3e29e8ce191a99641985baa371a5d504682 /src/webengine/render_widget_host_view_qt_delegate_quick.h | |
parent | 1a0e71b130f55a3ce77c6b27ac898355253f1b9a (diff) | |
parent | 2b953bf803aa74f4c6e1e3f06b22887c1ac80961 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
Change-Id: I49d99b5ac2cfba243eda1ea705c2a7d71b5542f6
Diffstat (limited to 'src/webengine/render_widget_host_view_qt_delegate_quick.h')
-rw-r--r-- | src/webengine/render_widget_host_view_qt_delegate_quick.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.h b/src/webengine/render_widget_host_view_qt_delegate_quick.h index c51ca3408..8d6a5d907 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.h +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h @@ -103,6 +103,7 @@ private: QList<QMetaObject::Connection> m_windowConnections; bool m_isPopup; bool m_initialized; + QPoint m_lastGlobalPos; }; } // namespace QtWebEngineCore |