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/config | |
| 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/config')
| -rw-r--r-- | src/core/config/embedded_linux.pri | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index 0133dc6b0..bc7c42ab7 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -23,6 +23,7 @@ GYP_CONFIG += \ gtest_target_type=none \ host_clang=0 \ notifications=0 \ + ozone_auto_platforms=0 \ ozone_platform_dri=0 \ ozone_platform_test=0 \ p2p_apis=0 \ @@ -39,7 +40,9 @@ GYP_CONFIG += \ use_gnome_keyring=0 \ use_kerberos=0 \ use_libpci=0 \ + use_nss_certs=0 \ use_openssl=1 \ + use_openssl_certs=1 \ use_ozone=1 \ use_pango=0 \ use_system_fontconfig=1 \ |