From f7be7480dec52a301cd51d60288bcb208bf2f034 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 8 Jul 2020 13:06:41 +0200 Subject: Update dependencies on 'dev' in qtwebengine Reenabling quickcontrols2 and webchannel now that they are in sync again. Change-Id: Ie072511d9be9a722f34b913c835f54f73704fc75 Reviewed-by: Michal Klocek --- src/core/web_engine_context.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/core/web_engine_context.cpp') diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 31e78e7d0..37ff0c61c 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -127,6 +127,7 @@ #include #if QT_CONFIG(opengl) # include +# include #endif #include #include @@ -209,7 +210,7 @@ bool usingSoftwareDynamicGL() if (QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL)) return true; #if defined(Q_OS_WIN) && QT_CONFIG(opengl) - HMODULE handle = static_cast(QOpenGLContext::openGLModuleHandle()); + HMODULE handle = QPlatformInterface::QWGLContext::openGLModuleHandle(); wchar_t path[MAX_PATH]; DWORD size = GetModuleFileName(handle, path, MAX_PATH); QFileInfo openGLModule(QString::fromWCharArray(path, size)); @@ -674,12 +675,12 @@ WebEngineContext::WebEngineContext() if (tryGL) { if (qt_gl_global_share_context() && qt_gl_global_share_context()->isValid()) { // If the native handle is QEGLNativeContext try to use GL ES/2. - // If there is no native handle, assume we are using wayland and try GL ES/2. // If we are using ANGLE on Windows, use OpenGL ES (2 or 3). - if (qt_gl_global_share_context()->nativeHandle().isNull() - || !strcmp(qt_gl_global_share_context()->nativeHandle().typeName(), - "QEGLNativeContext") - || usingANGLE()) + if ( +#if QT_CONFIG(egl) + qt_gl_global_share_context()->platformInterface() || +#endif + usingANGLE()) { if (qt_gl_global_share_context()->isOpenGLES()) { glType = usingANGLE() ? gl::kGLImplementationANGLEName : gl::kGLImplementationEGLName; -- cgit v1.2.3