diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-07-03 11:22:48 +0200 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@gmail.com> | 2013-07-03 11:34:13 +0200 |
| commit | 5f70d82ba035f4acd8cc38e57de429171694019d (patch) | |
| tree | 95f799553d65b910a6a388ad9043285c9204e8ca /patches | |
| parent | 1949732342370b8e4ae1b0da619fb8f1a6861aa9 (diff) | |
Do not warn for header-hygiene.
QtDeclarative is consciously leaking the namespace QtQml.
Therefore clang would warn about header hygiene.
Unfortunately this cannot be fixed in QtDeclarative,
unless we accept not to be able to use QtQuick1 and QtQuick2
in the same application.
Change-Id: I5ba78eb20f98e2e04d9c190794c83710b7f196e4
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/0001-Do-not-warn-for-header-hygiene.patch | 29 | ||||
| -rwxr-xr-x | patches/patch-chromium.sh | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/patches/0001-Do-not-warn-for-header-hygiene.patch b/patches/0001-Do-not-warn-for-header-hygiene.patch new file mode 100644 index 000000000..c13e3257c --- /dev/null +++ b/patches/0001-Do-not-warn-for-header-hygiene.patch @@ -0,0 +1,29 @@ +From 5f3a19c6f12690d882f1136af4338531c04149b3 Mon Sep 17 00:00:00 2001 +From: Zeno Albisser <zeno.albisser@digia.com> +Date: Wed, 3 Jul 2013 11:16:56 +0200 +Subject: [PATCH] Do not warn for header-hygiene. + +QtDeclarative is consciously leaking the namespace QtQml. +Therefore clang would warn about header hygiene. +Unfortunately this cannot be fixed in QtDeclarative, +unless we accept not to be able to use QtQuick1 and QtQuick2 +in the same application. +--- + build/common.gypi | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build/common.gypi b/build/common.gypi +index 0e57abb..e81104b 100644 +--- a/build/common.gypi ++++ b/build/common.gypi +@@ -3850,6 +3850,7 @@ + '-Wno-newline-eof', + '-Wno-unused-value', + '-Wno-unused-variable', ++ '-Wno-header-hygiene', + ], + }], + ['clang==1 and clang_use_chrome_plugins==1', { +-- +1.7.12.4 (Apple Git-37) + diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh index 6d39e87b6..6bc1c5e05 100755 --- a/patches/patch-chromium.sh +++ b/patches/patch-chromium.sh @@ -66,6 +66,7 @@ git am $PATCH_DIR/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch git am $PATCH_DIR/0001-Mac-Use-libc-instead-of-stdlibc.patch git am $PATCH_DIR/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch git am $PATCH_DIR/0001-Mac-Do-not-modify-the-child-path.patch +git am $PATCH_DIR/0001-Do-not-warn-for-header-hygiene.patch cd $CHROMIUM_SRC_DIR/third_party/WebKit echo "Entering $PWD" |