diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-03-04 13:41:55 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-03-26 19:17:16 +0100 |
| commit | 453694e2b73f7d5249ce193d068b8e83cdfa7eda (patch) | |
| tree | 222dbb5453c7f59faaa9140fb04d9c80b36b75da /src/core/ozone | |
| parent | e58f91dc78ebba1caf156ee46bb4ca2bf6272c02 (diff) | |
Remove dead ozone code
This code does nothing now
Pick-to: 6.3
Change-Id: Ic4fca6c89a8ae42a5bb2264eb8d946f878449556
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/ozone')
| -rw-r--r-- | src/core/ozone/gl_ozone_egl_qt.cpp | 10 | ||||
| -rw-r--r-- | src/core/ozone/gl_share_context_qt.cpp | 3 |
2 files changed, 1 insertions, 12 deletions
diff --git a/src/core/ozone/gl_ozone_egl_qt.cpp b/src/core/ozone/gl_ozone_egl_qt.cpp index 2b28e29ce..2071dcf81 100644 --- a/src/core/ozone/gl_ozone_egl_qt.cpp +++ b/src/core/ozone/gl_ozone_egl_qt.cpp @@ -55,16 +55,6 @@ namespace ui { -base::NativeLibrary LoadLibrary(const base::FilePath& filename) { - base::NativeLibraryLoadError error; - base::NativeLibrary library = base::LoadNativeLibrary(filename, &error); - if (!library) { - LOG(ERROR) << "Failed to load " << filename.MaybeAsASCII() << ": " << error.ToString(); - return NULL; - } - return library; -} - bool GLOzoneEGLQt::LoadGLES2Bindings(const gl::GLImplementationParts & /*implementation*/) { base::NativeLibrary eglgles2Library = dlopen(NULL, RTLD_LAZY); diff --git a/src/core/ozone/gl_share_context_qt.cpp b/src/core/ozone/gl_share_context_qt.cpp index 4865734f7..2eb34e86a 100644 --- a/src/core/ozone/gl_share_context_qt.cpp +++ b/src/core/ozone/gl_share_context_qt.cpp @@ -51,11 +51,10 @@ namespace QtWebEngineCore { -QtShareGLContext::QtShareGLContext(QOpenGLContext *qtContext) +QtShareGLContext::QtShareGLContext(QOpenGLContext *context) : gl::GLContext(nullptr), m_handle(nullptr) { #if QT_CONFIG(opengl) - QOpenGLContext *context = QOpenGLContext::globalShareContext(); #if defined(Q_OS_MACOS) auto *mac_ctx = context->nativeInterface<QNativeInterface::QCocoaGLContext>(); if (mac_ctx) |