summaryrefslogtreecommitdiffstats
path: root/src/core/qtwebengine_extras.gypi
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@theqtcompany.com>2015-02-11 18:37:38 +0100
committerAndras Becsi <andras.becsi@theqtcompany.com>2015-02-20 12:57:24 +0000
commitd2b9c003f87e34ca599d3264a9af371e435ad0f8 (patch)
tree2b9ced68cd24a2a06f8018152fa9f1de862e650e /src/core/qtwebengine_extras.gypi
parent552624b40f1af790bf747f52754895314d563f1d (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/qtwebengine_extras.gypi')
-rw-r--r--src/core/qtwebengine_extras.gypi3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi
index b0e9bc697..c128f289a 100644
--- a/src/core/qtwebengine_extras.gypi
+++ b/src/core/qtwebengine_extras.gypi
@@ -86,9 +86,6 @@
'EGL_API_FB=1',
'LINUX=1',
],
- 'defines!': [
- 'OPENSSLDIR="/etc/ssl"',
- ],
'target_conditions': [
['_type=="shared_library"', {
'ldflags': [