From 6c44e3bb4da24d048382a779b25331d57f052de0 Mon Sep 17 00:00:00 2001
From: Pierre Rossi <pierre.rossi@digia.com>
Date: Fri, 10 Jan 2014 17:33:11 +0100
Subject: [PATCH] Disable Werror by default
We don't want everybody to have to go and tweak ~/.gyp/include.gypi
just for that purpose.
Change-Id: I67533a62246dea45c4b5a5a454f43d01328d472f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
README.md | 14 +-------------
src/core/qtwebengine_extras.gypi | 3 +++
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/README.md b/README.md
index 61905d528..275a550de 100644
--- a/README.md
+++ b/README.md
@@ -48,19 +48,7 @@ Use of shared libraries can be enforced by setting the GYP_DEFINES environment v
export GYP_DEFINES=component=shared_library
- Or by using the include.gypi mechanism described below:
-
-### Compiler Warnings treated as Errors (-Werror) ###
-On Linux you may get build errors due to -Werror. Create ~/.gyp/include.gypi with the following contents:
-
- {
- 'variables': {
- 'werror%': '',
- 'component%': 'shared_library',
- },
- }
-
-So afterwards you have to re-create the ninja files by running "qmake -r"
+ Or by using the ~/.gyp/include.gypi mechanism.
### Use external Chromium sources ###
If you want to use external chromium sources instead of the submodule provided in the QtWebEngine repository,
diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi
index 95c5c5627..f4d3e38b7 100644
--- a/src/core/qtwebengine_extras.gypi
+++ b/src/core/qtwebengine_extras.gypi
@@ -1,4 +1,7 @@
{
+ 'variables': {
+ 'werror%': '',
+ },
'target_defaults': {
# patterns used to exclude chromium files from the build when we have a drop-in replacement
'sources/': [
--
GitLab