diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-13 13:49:08 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-14 09:16:38 +0000 |
| commit | e138b30689e49229cbeb0cba8ecd4116e3ee91d5 (patch) | |
| tree | 9fc4bcf3115fc99ca7f8c8240822aa56b5adf6ca /src/core/surface_factory_qt.cpp | |
| parent | ae15f74a1644f6b02c51e8b4a169671c1d0c9af9 (diff) | |
Remove eAndroid hooks
Support for the B2Qt/eAndroid platform is discontinued with
Qt 5.5 so we can remove all remnants of the android platform.
Change-Id: I93f15fcd4a345203e15010ddf1e8de3e8d28ab56
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/surface_factory_qt.cpp')
| -rw-r--r-- | src/core/surface_factory_qt.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp index 963f7b517..40c65d9d3 100644 --- a/src/core/surface_factory_qt.cpp +++ b/src/core/surface_factory_qt.cpp @@ -45,7 +45,8 @@ #include <QGuiApplication> -#if defined(USE_OZONE) || defined(OS_ANDROID) +#if defined(USE_OZONE) + #include <EGL/egl.h> #ifndef QT_LIBDIR_EGL @@ -69,12 +70,6 @@ base::NativeLibrary LoadLibrary(const base::FilePath& filename) { bool SurfaceFactoryQt::LoadEGLGLES2Bindings(AddGLLibraryCallback add_gl_library, SetGLGetProcAddressProcCallback set_gl_get_proc_address) { -#if defined(OS_ANDROID) - // This is done in gl_implementation_android.cc for now. We might need to switch if we - // start supporting the emulator platform but that would be a more intrusive change. - Q_UNREACHABLE(); - return false; -#else base::FilePath libEGLPath = QtWebEngineCore::toFilePath(QT_LIBDIR_EGL); libEGLPath = libEGLPath.Append("libEGL.so"); base::NativeLibrary eglLibrary = LoadLibrary(libEGLPath); @@ -99,7 +94,6 @@ bool SurfaceFactoryQt::LoadEGLGLES2Bindings(AddGLLibraryCallback add_gl_library, gfx::AddGLNativeLibrary(eglLibrary); gfx::AddGLNativeLibrary(gles2Library); return true; -#endif // defined(OS_ANDROID) } intptr_t SurfaceFactoryQt::GetNativeDisplay() @@ -114,5 +108,5 @@ intptr_t SurfaceFactoryQt::GetNativeDisplay() } // namespace QtWebEngineCore -#endif // defined(USE_OZONE) || defined(OS_ANDROID) +#endif // defined(USE_OZONE) |