diff options
author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-08-14 15:17:25 +0200 |
---|---|---|
committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-08-24 13:34:12 +0000 |
commit | 937ff1c56be6bb0a3ef296b92fd1f2326b99dca9 (patch) | |
tree | b65f7ec4afb70dbc23722fe192c8afa274b5f2f2 /src/core/ozone_platform_eglfs.cpp | |
parent | a42c618053748d988fab0b93497a1fc9cdd12b69 (diff) |
Fix the build on embedded linux
This patch:
- adds required options to the embedded_linux.pri config
- adds missing events_ozone.gyp:events_ozone_evdev dependency
- fixes pkg-config not to pick host paths when cross compiling
- implements missing functions of the OzonePlatform interface
- updates the submodule to include fixes for chromium
Change-Id: I77b384738fa7d41938a68c10a007728b10d7db28
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/ozone_platform_eglfs.cpp')
-rw-r--r-- | src/core/ozone_platform_eglfs.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/core/ozone_platform_eglfs.cpp b/src/core/ozone_platform_eglfs.cpp index 43a3e4a11..9dca83685 100644 --- a/src/core/ozone_platform_eglfs.cpp +++ b/src/core/ozone_platform_eglfs.cpp @@ -95,6 +95,7 @@ public: void Restore() override { } void SetCursor(PlatformCursor) override { } void MoveCursorTo(const gfx::Point&) override { } + void ConfineCursorToBounds(const gfx::Rect&) override { } // PlatformEventDispatcher: bool CanDispatchEvent(const PlatformEvent& event) override; @@ -160,6 +161,14 @@ scoped_ptr<PlatformWindow> OzonePlatformEglfs::CreatePlatformWindow( bounds)); } +ui::InputController* OzonePlatformEglfs::GetInputController() { + return input_controller_.get(); +} + +scoped_ptr<ui::SystemInputInjector> OzonePlatformEglfs::CreateSystemInputInjector() { + return nullptr; // no input injection support. +} + scoped_ptr<ui::NativeDisplayDelegate> OzonePlatformEglfs::CreateNativeDisplayDelegate() { return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone()); @@ -170,8 +179,9 @@ OzonePlatform* CreateOzonePlatformEglfs() { return new OzonePlatformEglfs; } void OzonePlatformEglfs::InitializeUI() { device_manager_ = CreateDeviceManager(); cursor_factory_ozone_.reset(new CursorFactoryOzone()); - event_factory_ozone_.reset(new EventFactoryEvdev(NULL, device_manager_.get())); + event_factory_ozone_.reset(new EventFactoryEvdev(NULL, device_manager_.get(), NULL)); gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost()); + input_controller_ = CreateStubInputController(); } void OzonePlatformEglfs::InitializeGPU() { |