diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-08 13:06:41 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-13 13:07:03 +0200 |
| commit | f7be7480dec52a301cd51d60288bcb208bf2f034 (patch) | |
| tree | ee27cd9096b55e9d2ef42c150b3393dd528a7900 | |
| parent | 5988cec1a1b59aa163042a419c4c2e978bb814bb (diff) | |
Update dependencies on 'dev' in qtwebengine
Reenabling quickcontrols2 and webchannel now that they are in sync
again.
Change-Id: Ie072511d9be9a722f34b913c835f54f73704fc75
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | dependencies.yaml | 16 | ||||
| -rw-r--r-- | src/core/web_engine_context.cpp | 13 |
2 files changed, 15 insertions, 14 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 9a7d4c4e3..91413a31b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,6 +1,6 @@ dependencies: ../qtdeclarative: - ref: 8a19c2c64dcc07221d4d4a88782d51cb2ec93995 + ref: 08dbc9940bcb4d139313f03f2aec5a1cbccdbfd3 required: true # ../qtlocation: # ref: a8793c6d9695498b3a53793f21859421262b4541 @@ -8,12 +8,12 @@ dependencies: # ../qtquickcontrols: # ref: 59749d56d666a6687fcedc2f7892080467db8574 # required: false -# ../qtquickcontrols2: -# ref: dd90f7be501a9545e74aaecacba1d469a8fad5aa -# required: false + ../qtquickcontrols2: + ref: 2ff6d3a112d802f0d69e359a23e09e5d645eeca7 + required: false ../qttools: - ref: e14abcec169cf263e8c58c59e751928c1fddb34d + ref: 83a1f50e2cb6e82346b72769df08ba1b046a6e3c + required: false + ../qtwebchannel: + ref: 6ff8dbcdf3e68315b76b82eb32561282f2a70147 required: false -# ../qtwebchannel: -# ref: 8554d71f47f85b111f095ea8f25c3a72c5cae32e -# required: false 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 <QOffscreenSurface> #if QT_CONFIG(opengl) # include <QOpenGLContext> +# include <qopenglcontext_platform.h> #endif #include <QQuickWindow> #include <QStringList> @@ -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<HMODULE>(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<QPlatformInterface::QEGLContext>() || +#endif + usingANGLE()) { if (qt_gl_global_share_context()->isOpenGLES()) { glType = usingANGLE() ? gl::kGLImplementationANGLEName : gl::kGLImplementationEGLName; |