Commit 937ff1c5 authored by Andras Becsi's avatar Andras Becsi
Browse files

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: default avatarAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Showing with 26 additions and 2 deletions
Subproject commit 154d7a3611197845352b3e1d3ebeaf429d37e656 Subproject commit 4140f5c535bd1626c06c6be122da6b97e2a737bb
...@@ -23,6 +23,7 @@ GYP_CONFIG += \ ...@@ -23,6 +23,7 @@ GYP_CONFIG += \
gtest_target_type=none \ gtest_target_type=none \
host_clang=0 \ host_clang=0 \
notifications=0 \ notifications=0 \
ozone_auto_platforms=0 \
ozone_platform_dri=0 \ ozone_platform_dri=0 \
ozone_platform_test=0 \ ozone_platform_test=0 \
p2p_apis=0 \ p2p_apis=0 \
...@@ -39,7 +40,9 @@ GYP_CONFIG += \ ...@@ -39,7 +40,9 @@ GYP_CONFIG += \
use_gnome_keyring=0 \ use_gnome_keyring=0 \
use_kerberos=0 \ use_kerberos=0 \
use_libpci=0 \ use_libpci=0 \
use_nss_certs=0 \
use_openssl=1 \ use_openssl=1 \
use_openssl_certs=1 \
use_ozone=1 \ use_ozone=1 \
use_pango=0 \ use_pango=0 \
use_system_fontconfig=1 \ use_system_fontconfig=1 \
......
...@@ -95,6 +95,7 @@ public: ...@@ -95,6 +95,7 @@ public:
void Restore() override { } void Restore() override { }
void SetCursor(PlatformCursor) override { } void SetCursor(PlatformCursor) override { }
void MoveCursorTo(const gfx::Point&) override { } void MoveCursorTo(const gfx::Point&) override { }
void ConfineCursorToBounds(const gfx::Rect&) override { }
// PlatformEventDispatcher: // PlatformEventDispatcher:
bool CanDispatchEvent(const PlatformEvent& event) override; bool CanDispatchEvent(const PlatformEvent& event) override;
...@@ -160,6 +161,14 @@ scoped_ptr<PlatformWindow> OzonePlatformEglfs::CreatePlatformWindow( ...@@ -160,6 +161,14 @@ scoped_ptr<PlatformWindow> OzonePlatformEglfs::CreatePlatformWindow(
bounds)); 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() scoped_ptr<ui::NativeDisplayDelegate> OzonePlatformEglfs::CreateNativeDisplayDelegate()
{ {
return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone()); return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone());
...@@ -170,8 +179,9 @@ OzonePlatform* CreateOzonePlatformEglfs() { return new OzonePlatformEglfs; } ...@@ -170,8 +179,9 @@ OzonePlatform* CreateOzonePlatformEglfs() { return new OzonePlatformEglfs; }
void OzonePlatformEglfs::InitializeUI() { void OzonePlatformEglfs::InitializeUI() {
device_manager_ = CreateDeviceManager(); device_manager_ = CreateDeviceManager();
cursor_factory_ozone_.reset(new CursorFactoryOzone()); 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()); gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost());
input_controller_ = CreateStubInputController();
} }
void OzonePlatformEglfs::InitializeGPU() { void OzonePlatformEglfs::InitializeGPU() {
......
...@@ -62,6 +62,8 @@ class OzonePlatformEglfs : public OzonePlatform { ...@@ -62,6 +62,8 @@ class OzonePlatformEglfs : public OzonePlatform {
PlatformWindowDelegate* delegate, PlatformWindowDelegate* delegate,
const gfx::Rect& bounds) override; const gfx::Rect& bounds) override;
virtual scoped_ptr<ui::NativeDisplayDelegate> CreateNativeDisplayDelegate() override; virtual scoped_ptr<ui::NativeDisplayDelegate> CreateNativeDisplayDelegate() override;
virtual ui::InputController* GetInputController() override;
virtual scoped_ptr<ui::SystemInputInjector> CreateSystemInputInjector() override;
private: private:
virtual void InitializeUI() override; virtual void InitializeUI() override;
...@@ -74,6 +76,7 @@ class OzonePlatformEglfs : public OzonePlatform { ...@@ -74,6 +76,7 @@ class OzonePlatformEglfs : public OzonePlatform {
scoped_ptr<GpuPlatformSupport> gpu_platform_support_; scoped_ptr<GpuPlatformSupport> gpu_platform_support_;
scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_; scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
scoped_ptr<InputController> input_controller_;
DISALLOW_COPY_AND_ASSIGN(OzonePlatformEglfs); DISALLOW_COPY_AND_ASSIGN(OzonePlatformEglfs);
}; };
......
...@@ -84,6 +84,9 @@ ...@@ -84,6 +84,9 @@
], ],
}, },
}, },
'dependencies': [
'<(chromium_src_dir)/ui/events/ozone/events_ozone.gyp:events_ozone_evdev'
]
}], }],
['qt_os=="win32" and qt_gl=="opengl"', { ['qt_os=="win32" and qt_gl=="opengl"', {
'include_dirs': [ 'include_dirs': [
......
...@@ -86,6 +86,11 @@ if __name__ == '__main__': ...@@ -86,6 +86,11 @@ if __name__ == '__main__':
if 'qt_cross_compile=1' in sys.argv: if 'qt_cross_compile=1' in sys.argv:
os.environ['GYP_CROSSCOMPILE'] = '1' os.environ['GYP_CROSSCOMPILE'] = '1'
sysroot = 'sysroot='
for opt in sys.argv:
if opt.startswith(sysroot):
os.environ['PKG_CONFIG_SYSROOT_DIR'] = opt[len(sysroot):]
gyp_helper.apply_chromium_gyp_env() gyp_helper.apply_chromium_gyp_env()
# This could give false positives since it doesn't actually do real option # This could give false positives since it doesn't actually do real option
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment