diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-02-04 17:12:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-05 15:51:30 +0100 |
| commit | 5a304a9adb834afc946c949cf8538a4f8b5d7cdd (patch) | |
| tree | d97b5d3e34d926c9d05c57d310dd41e3dfd4a754 /src/core/chromium_overrides.cpp | |
| parent | ecaab295f96e3d12fc952c49d35a6eb32f72aba1 (diff) | |
Fix the embedded build
Adopt to toolchain changes and fix the build with the
current snapshot.
This patch adds some missing overrides and build system
configurations.
Change-Id: I488929500347bdb5a077ac14e9553cedfcaa605d
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/core/chromium_overrides.cpp')
| -rw-r--r-- | src/core/chromium_overrides.cpp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp index 383fc6587..be97bc089 100644 --- a/src/core/chromium_overrides.cpp +++ b/src/core/chromium_overrides.cpp @@ -41,7 +41,6 @@ #include "chromium_overrides.h" -#include "base/message_loop/message_pump_gtk.h" #include "content/browser/renderer_host/render_widget_host_view_base.h" #include <QGuiApplication> @@ -49,7 +48,12 @@ #include <QWindow> #include <qpa/qplatformnativeinterface.h> +#if defined(OS_ANDROID) +#include "media/video/capture/fake_video_capture_device.h" +#endif + #if defined(USE_X11) +#include "base/message_loop/message_pump_gtk.h" #include <X11/Xlib.h> #endif @@ -113,3 +117,20 @@ void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebKit::WebScreenInfo* resul } } + +#if defined(OS_ANDROID) +namespace ui { +bool GrabViewSnapshot(gfx::NativeView /*view*/, std::vector<unsigned char>* /*png_representation*/, const gfx::Rect& /*snapshot_bounds*/) +{ + NOTIMPLEMENTED(); + return false; +} +} + +namespace media { +const std::string FakeVideoCaptureDevice::Name::GetModel() const +{ + return ""; +} +} +#endif |