diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-06 12:19:11 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-06 12:19:11 +0200 |
commit | 7439343d169095a510d122ad7c69646a5946cdce (patch) | |
tree | 8540b2bac1e495533585a645e216eaab66b06bd2 /src/webengine/render_widget_host_view_qt_delegate_quick.h | |
parent | 3ecd61aea90cc4b283ffe9409cc10f5fd3476ecf (diff) | |
parent | f8c132ffb7cd32d52bbfe09caa811665a3cb1069 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/3rdparty
src/webengine/api/qquickwebenginesettings.cpp
Change-Id: Ie4abadb076c51d070cbb05f29b9ebcd9705933ad
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 de3aff291..385a98a3c 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.h +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h @@ -104,6 +104,7 @@ private: QList<QMetaObject::Connection> m_windowConnections; bool m_isPopup; bool m_initialized; + QPoint m_lastGlobalPos; }; } // namespace QtWebEngineCore |