diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 21:00:04 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:28 +0100 |
commit | aea363afaa193feee774dad30d81c516ea4a98fc (patch) | |
tree | 00b6ca102fe4b7c09da87d482ec04a90d128e03c /meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch | |
parent | 425df23c02b7dad3c843ec9959a51337ab450cd1 (diff) | |
download | poky-aea363afaa193feee774dad30d81c516ea4a98fc.tar.gz |
qt4: replace all local patches with git patches with headers
* in preparation for upgrade to 4.8.3
(From OE-Core rev: 24bf06bbcda4c0dfdad33cdff6394faa52657bb9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch deleted file mode 100644 index 47618cfde1..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | Fix compile error when using toolchains based on GCC 4.7. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Ken Werner <ken.werner@linaro.org> | ||
6 | |||
7 | Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h | ||
8 | =================================================================== | ||
9 | --- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h | ||
10 | +++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h | ||
11 | @@ -57,9 +57,7 @@ namespace JSC { | ||
12 | |||
13 | class JSGlobalObject : public JSVariableObject { | ||
14 | protected: | ||
15 | - using JSVariableObject::JSVariableObjectData; | ||
16 | - | ||
17 | - struct JSGlobalObjectData : public JSVariableObjectData { | ||
18 | + struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData { | ||
19 | // We use an explicit destructor function pointer instead of a | ||
20 | // virtual destructor because we want to avoid adding a vtable | ||
21 | // pointer to this struct. Adding a vtable pointer would force the | ||
22 | Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h | ||
23 | =================================================================== | ||
24 | --- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h | ||
25 | +++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h | ||
26 | @@ -32,8 +32,7 @@ namespace JSC{ | ||
27 | |||
28 | class JSStaticScopeObject : public JSVariableObject { | ||
29 | protected: | ||
30 | - using JSVariableObject::JSVariableObjectData; | ||
31 | - struct JSStaticScopeObjectData : public JSVariableObjectData { | ||
32 | + struct JSStaticScopeObjectData : public JSVariableObjectData::JSVariableObjectData { | ||
33 | JSStaticScopeObjectData() | ||
34 | : JSVariableObjectData(&symbolTable, ®isterStore + 1) | ||
35 | { | ||