diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-06 18:19:58 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-13 13:46:31 +0100 |
| commit | 6aa4bb60d7d10e50cb562756ef8210f559b35d1e (patch) | |
| tree | 9ea64e167416ce6975dd957a56ed8b0e0ace2154 /patches/0001-remove-Wno-deprecated-register-from-common.gypi.patch | |
| parent | b6b03a8316cb1777efb05cd851ca0cb3b989597a (diff) | |
Update chromium patches to apply on current stable (1650)
Change-Id: I3cd2ddc401e67c232c4bcc88d3c20252eece6be3
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@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 90dbe8da0..3a5bef7f8 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 07abb6a..19ef09c 100644 +index ab759282..cf5b196 100644 --- a/build/common.gypi +++ b/build/common.gypi -@@ -3166,7 +3166,7 @@ +@@ -3222,7 +3222,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 07abb6a..19ef09c 100644 ], 'cflags!': [ # Clang doesn't seem to know know this flag. -@@ -3877,7 +3877,7 @@ +@@ -3925,7 +3925,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', ], - 'OTHER_CPLUSPLUSFLAGS': [ - # gnu++11 instead of c++11 is needed because some code uses + }], + ['use_libcpp==1', { -- -1.7.12.4 (Apple Git-37) +1.8.4.2 |