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/webengine/render_widget_host_view_qt_delegate_quick.cpp | |
| parent | 4e6e907001d4cf0833465407f8a0fa68e6ce564b (diff) | |
| parent | 4c94370394ccf1e00233669df01599cb6141a5dc (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Idee0142b0e33fdf8ca663f1ef1bcd8b932985043
Diffstat (limited to 'src/webengine/render_widget_host_view_qt_delegate_quick.cpp')
| -rw-r--r-- | src/webengine/render_widget_host_view_qt_delegate_quick.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp index 6eb5adec2..1c42c206d 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -43,15 +43,17 @@ #include "qquickwebengineview_p.h" #include "qquickwebengineview_p_p.h" + #include <QGuiApplication> -#include <QOpenGLContext> -#include <QQuickPaintedItem> #include <QQuickWindow> -#include <QSurfaceFormat> +#include <QSGImageNode> #include <QVariant> #include <QWindow> -#include <QtQuick/qsgimagenode.h> -#include <QtQuick/private/qquickwindow_p.h> + +#if defined(Q_OS_MACOS) && QT_CONFIG(opengl) +#include <QOpenGLContext> +#include <QSurfaceFormat> +#endif namespace QtWebEngineCore { |