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/config | |
| 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/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 773bf0be1..a0d640c18 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -2,6 +2,7 @@ GYP_ARGS += "-D qt_os=\"embedded_linux\" -I config/embedded_linux.gypi" GYP_CONFIG += \ build_ffmpegsumo=1 \ + clang=0 \ configuration_policy=0 \ desktop_linux=0 \ disable_nacl=1 \ @@ -23,6 +24,7 @@ GYP_CONFIG += \ enable_themes=0 \ enable_webrtc=0 \ gtest_target_type=none \ + host_clang=0 \ notifications=0 \ ozone_platform_dri=0 \ ozone_platform_test=0 \ @@ -40,6 +42,7 @@ GYP_CONFIG += \ use_gio=0 \ use_gnome_keyring=0 \ use_kerberos=0 \ + use_libpci=0 \ use_openssl=1 \ use_ozone=1 \ use_pango=0 \ |