From 5618d90a9c005d98bad645e8c62eee800700df40 Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Wed, 4 Mar 2015 14:21:34 +0100
Subject: [PATCH] Add missing QtWebEngineCore namespace refs to egl integration
Also add a missing include (for compilation without accessibility)
Change-Id: Iea3def18d898e249b82968cd25495b62ffb80cfe
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
---
src/core/ozone_platform_eglfs.cpp | 2 +-
src/core/ozone_platform_eglfs.h | 2 +-
src/core/surface_factory_qt.cpp | 4 ++--
src/webenginewidgets/api/qwebenginepage.cpp | 1 +
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/core/ozone_platform_eglfs.cpp b/src/core/ozone_platform_eglfs.cpp
index f646ac2a6..43a3e4a11 100644
--- a/src/core/ozone_platform_eglfs.cpp
+++ b/src/core/ozone_platform_eglfs.cpp
@@ -175,7 +175,7 @@ void OzonePlatformEglfs::InitializeUI() {
}
void OzonePlatformEglfs::InitializeGPU() {
- surface_factory_ozone_.reset(new SurfaceFactoryQt());
+ surface_factory_ozone_.reset(new QtWebEngineCore::SurfaceFactoryQt());
gpu_platform_support_.reset(CreateStubGpuPlatformSupport());
}
diff --git a/src/core/ozone_platform_eglfs.h b/src/core/ozone_platform_eglfs.h
index 2371bb1e8..6954595dd 100644
--- a/src/core/ozone_platform_eglfs.h
+++ b/src/core/ozone_platform_eglfs.h
@@ -68,7 +68,7 @@ class OzonePlatformEglfs : public OzonePlatform {
virtual void InitializeGPU() override;
scoped_ptr<DeviceManager> device_manager_;
- scoped_ptr<SurfaceFactoryQt> surface_factory_ozone_;
+ scoped_ptr<QtWebEngineCore::SurfaceFactoryQt> surface_factory_ozone_;
scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_;
scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp
index d5cb78f29..963f7b517 100644
--- a/src/core/surface_factory_qt.cpp
+++ b/src/core/surface_factory_qt.cpp
@@ -75,13 +75,13 @@ bool SurfaceFactoryQt::LoadEGLGLES2Bindings(AddGLLibraryCallback add_gl_library,
Q_UNREACHABLE();
return false;
#else
- base::FilePath libEGLPath = toFilePath(QT_LIBDIR_EGL);
+ base::FilePath libEGLPath = QtWebEngineCore::toFilePath(QT_LIBDIR_EGL);
libEGLPath = libEGLPath.Append("libEGL.so");
base::NativeLibrary eglLibrary = LoadLibrary(libEGLPath);
if (!eglLibrary)
return false;
- base::FilePath libGLES2Path = toFilePath(QT_LIBDIR_GLES2);
+ base::FilePath libGLES2Path = QtWebEngineCore::toFilePath(QT_LIBDIR_GLES2);
libGLES2Path = libGLES2Path.Append("libGLESv2.so");
base::NativeLibrary gles2Library = LoadLibrary(libGLES2Path);
if (!gles2Library)
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 8b83856b0..f4ec57342 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -43,6 +43,7 @@
#include <QAuthenticator>
#include <QClipboard>
#include <QFileDialog>
+#include <QKeyEvent>
#include <QIcon>
#include <QInputDialog>
#include <QLayout>
--
GitLab