diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-15 14:57:23 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-17 09:12:12 +0100 |
commit | cd12379d43f8c2df14b19ebced316aa94b3f6043 (patch) | |
tree | f8ff1ac93a1a5502e60c243c32c54f80b1bd332d /src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp | |
parent | 4e6e907001d4cf0833465407f8a0fa68e6ce564b (diff) | |
parent | 4c94370394ccf1e00233669df01599cb6141a5dc (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Idee0142b0e33fdf8ca663f1ef1bcd8b932985043
Diffstat (limited to 'src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp')
-rw-r--r-- | src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp index a2e5a5e0e..5d8932fb7 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp @@ -44,15 +44,14 @@ #include "qwebenginepage_p.h" #include "qwebengineview.h" #include "qwebengineview_p.h" + #include <QGuiApplication> #include <QLayout> #include <QMouseEvent> #include <QOpenGLContext> #include <QResizeEvent> -#include <QSGNode> +#include <QSGImageNode> #include <QWindow> -#include <QtQuick/qsgimagenode.h> -#include <QtQuick/private/qquickwindow_p.h> namespace QtWebEngineCore { |