diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2015-03-04 14:21:34 +0100 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2015-03-04 13:36:01 +0000 |
| commit | 5618d90a9c005d98bad645e8c62eee800700df40 (patch) | |
| tree | 6c93a77929e220f7a714cccee2a48a653eb90e9e /src/core | |
| parent | 326996a7f95cbfe5301a929b6e3286f03263d46d (diff) | |
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>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ozone_platform_eglfs.cpp | 2 | ||||
| -rw-r--r-- | src/core/ozone_platform_eglfs.h | 2 | ||||
| -rw-r--r-- | src/core/surface_factory_qt.cpp | 4 |
3 files changed, 4 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) |