diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-02-11 18:37:38 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-02-20 12:57:24 +0000 |
| commit | d2b9c003f87e34ca599d3264a9af371e435ad0f8 (patch) | |
| tree | 2b9ced68cd24a2a06f8018152fa9f1de862e650e /src/core/surface_factory_qt.cpp | |
| parent | 552624b40f1af790bf747f52754895314d563f1d (diff) | |
Fix the build on eLinux
Update ozone layer to the new snapshot, update the
embedded_linux.pri configuration, fix the GLSurfaceQt
build on non-x11 linux and update embedded command line
switches for the 40.0.2214-based chromium snapshot.
This patch also updates the snapshot sha1 to include
required chromium changes.
Change-Id: I7f9446fa1b67a0af7baee564acff41ae33ff1a94
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp index cfa63a651..14e46b946 100644 --- a/src/core/surface_factory_qt.cpp +++ b/src/core/surface_factory_qt.cpp @@ -97,7 +97,7 @@ bool SurfaceFactoryQt::LoadEGLGLES2Bindings(AddGLLibraryCallback add_gl_library, gfx::AddGLNativeLibrary(eglLibrary); gfx::AddGLNativeLibrary(gles2Library); return true; -#endif +#endif // defined(OS_ANDROID) } intptr_t SurfaceFactoryQt::GetNativeDisplay() @@ -110,5 +110,5 @@ intptr_t SurfaceFactoryQt::GetNativeDisplay() return reinterpret_cast<intptr_t>(EGL_DEFAULT_DISPLAY); } -#endif +#endif // defined(USE_OZONE) || defined(OS_ANDROID) |