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/0019-javascriptcore-Fix-compile-error-when-using-toolchai.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/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.1/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch new file mode 100644 index 0000000000..13229d47e3 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 4811267206e20e5409df0500c02d7fe77caf5293 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ken Werner <ken.werner@linaro.org> | ||
3 | Date: Wed, 26 Sep 2012 20:53:35 +0200 | ||
4 | Subject: [PATCH 19/22] javascriptcore: Fix compile error when using | ||
5 | toolchains based on GCC 4.7. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
10 | --- | ||
11 | src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h | 4 +--- | ||
12 | .../javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h | 3 +-- | ||
13 | 2 files changed, 2 insertions(+), 5 deletions(-) | ||
14 | |||
15 | diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h | ||
16 | index 7c20272..917c0ff 100644 | ||
17 | --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h | ||
18 | +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h | ||
19 | @@ -57,9 +57,7 @@ namespace JSC { | ||
20 | |||
21 | class JSGlobalObject : public JSVariableObject { | ||
22 | protected: | ||
23 | - using JSVariableObject::JSVariableObjectData; | ||
24 | - | ||
25 | - struct JSGlobalObjectData : public JSVariableObjectData { | ||
26 | + struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData { | ||
27 | // We use an explicit destructor function pointer instead of a | ||
28 | // virtual destructor because we want to avoid adding a vtable | ||
29 | // pointer to this struct. Adding a vtable pointer would force the | ||
30 | diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h | ||
31 | index 2542878..637f62c 100644 | ||
32 | --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h | ||
33 | +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h | ||
34 | @@ -32,8 +32,7 @@ namespace JSC{ | ||
35 | |||
36 | class JSStaticScopeObject : public JSVariableObject { | ||
37 | protected: | ||
38 | - using JSVariableObject::JSVariableObjectData; | ||
39 | - struct JSStaticScopeObjectData : public JSVariableObjectData { | ||
40 | + struct JSStaticScopeObjectData : public JSVariableObjectData::JSVariableObjectData { | ||
41 | JSStaticScopeObjectData() | ||
42 | : JSVariableObjectData(&symbolTable, ®isterStore + 1) | ||
43 | { | ||
44 | -- | ||
45 | 1.7.12 | ||
46 | |||