diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-12-16 10:40:46 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-16 10:49:02 +0100 |
| commit | df8eff9b1e457fe0783cc6022bf7c21f5381afbb (patch) | |
| tree | 62d282de99c1409d13612cf6ab85972188cb3409 /patches/0001-remove-Wno-deprecated-register-from-common.gypi.patch | |
| parent | 0dd71c40535335affe93bbde0543b81be796f03e (diff) | |
Revert "Update chromium patches to apply on current stable (1650)"
Let's make sure that the submodule integration succeeds first.
This reverts commit 6aa4bb60d7d10e50cb562756ef8210f559b35d1e.
Change-Id: I5c9b81654296b3a8a240118f9af222b12dd2ecc4
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'patches/0001-remove-Wno-deprecated-register-from-common.gypi.patch')
| -rw-r--r-- | patches/0001-remove-Wno-deprecated-register-from-common.gypi.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/0001-remove-Wno-deprecated-register-from-common.gypi.patch b/patches/0001-remove-Wno-deprecated-register-from-common.gypi.patch index 3a5bef7f8..90dbe8da0 100644 --- a/patches/0001-remove-Wno-deprecated-register-from-common.gypi.patch +++ b/patches/0001-remove-Wno-deprecated-register-from-common.gypi.patch @@ -12,10 +12,10 @@ It seems that the flag is still supported in upstream clang. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/common.gypi b/build/common.gypi -index ab759282..cf5b196 100644 +index 07abb6a..19ef09c 100644 --- a/build/common.gypi +++ b/build/common.gypi -@@ -3222,7 +3222,7 @@ +@@ -3166,7 +3166,7 @@ # Clang considers the `register` keyword as deprecated, but e.g. # code generated by flex (used in angle) contains that keyword. # http://crbug.com/255186 @@ -24,15 +24,15 @@ index ab759282..cf5b196 100644 ], 'cflags!': [ # Clang doesn't seem to know know this flag. -@@ -3925,7 +3925,7 @@ +@@ -3877,7 +3877,7 @@ # Clang considers the `register` keyword as deprecated, but e.g. # code generated by flex (used in angle) contains that keyword. # http://crbug.com/255186 - '-Wno-deprecated-register', + '-Wno-deprecated', ], - }], - ['use_libcpp==1', { + 'OTHER_CPLUSPLUSFLAGS': [ + # gnu++11 instead of c++11 is needed because some code uses -- -1.8.4.2 +1.7.12.4 (Apple Git-37) |