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.h | |
| 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.h')
| -rw-r--r-- | src/core/surface_factory_qt.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/core/surface_factory_qt.h b/src/core/surface_factory_qt.h index ec70d79b1..bd4eba3c9 100644 --- a/src/core/surface_factory_qt.h +++ b/src/core/surface_factory_qt.h @@ -48,14 +48,9 @@ class SurfaceFactoryQt { virtual bool LoadEGLGLES2Bindings(AddGLLibraryCallback add_gl_library, SetGLGetProcAddressProcCallback set_gl_get_proc_address) Q_DECL_OVERRIDE; virtual intptr_t GetNativeDisplay() Q_DECL_OVERRIDE; - virtual ui::SurfaceFactoryOzone::HardwareState InitializeHardware() Q_DECL_OVERRIDE { return ui::SurfaceFactoryOzone::INITIALIZED; } - virtual void ShutdownHardware() Q_DECL_OVERRIDE {} - virtual gfx::AcceleratedWidget GetAcceleratedWidget() Q_DECL_OVERRIDE { return 0; } - virtual gfx::AcceleratedWidget RealizeAcceleratedWidget(gfx::AcceleratedWidget w) Q_DECL_OVERRIDE { return 0; } - virtual bool AttemptToResizeAcceleratedWidget(gfx::AcceleratedWidget w, const gfx::Rect& bounds) Q_DECL_OVERRIDE { return false; } }; -#endif +#endif // defined(USE_OZONE) || defined(OS_ANDROID) #endif // SURFACE_FACTORY_QT |