diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-27 12:21:43 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-30 11:37:29 +0100 |
commit | 6723f6be766b8dd4b367237e25f96eda75893e0c (patch) | |
tree | 79a6a0714876a3f1048a941df194aea647aa8fcb | |
parent | 69dc3c384ff91d1a5983b39a33fde23a8e711c5a (diff) | |
download | poky-6723f6be766b8dd4b367237e25f96eda75893e0c.tar.gz |
qt4: Add missing patch headers
(From OE-Core rev: ec2f6e1fb655289f5ef51f2b1fa86d5fedccfc61)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch | 4 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch b/meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch index d49d7bcff2..6efbaf5d97 100644 --- a/meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch +++ b/meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch | |||
@@ -1,6 +1,10 @@ | |||
1 | Disable the -fuse-ld=gold flag. This option is a Debian/Ubuntu specific | 1 | Disable the -fuse-ld=gold flag. This option is a Debian/Ubuntu specific |
2 | extension to the g++ and causes upstream GCC to throw an error. | 2 | extension to the g++ and causes upstream GCC to throw an error. |
3 | 3 | ||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Ken Werner <ken.werner@linaro.org> | ||
7 | |||
4 | Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri | 8 | Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri |
5 | =================================================================== | 9 | =================================================================== |
6 | --- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/webkit/Source/common.pri | 10 | --- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/webkit/Source/common.pri |
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch b/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch index 8252817af1..47618cfde1 100644 --- a/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch +++ b/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch | |||
@@ -1,5 +1,9 @@ | |||
1 | Fix compile error when using toolchains based on GCC 4.7. | 1 | Fix compile error when using toolchains based on GCC 4.7. |
2 | 2 | ||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Ken Werner <ken.werner@linaro.org> | ||
6 | |||
3 | Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h | 7 | Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h |
4 | =================================================================== | 8 | =================================================================== |
5 | --- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h | 9 | --- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h |