diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 20:00:58 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:26 +0100 |
| commit | a0a29221c8df7c277139b0c875330f08cb2bdea3 (patch) | |
| tree | 967c8777a198f33333e458ca8579fe896c784e99 /meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch | |
| parent | 248e9f48c77212372b50074f0a475a16bb8db4be (diff) | |
| download | ast2050-yocto-poky-a0a29221c8df7c277139b0c875330f08cb2bdea3.zip ast2050-yocto-poky-a0a29221c8df7c277139b0c875330f08cb2bdea3.tar.gz | |
qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb
(From OE-Core rev: dcda03d3f6ec442740e3683a1971103dc639689d)
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/qt-4.8.1/gcc47-fix.patch')
| -rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch | 35 |
1 files changed, 0 insertions, 35 deletions
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 deleted file mode 100644 index 47618cf..0000000 --- a/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -Fix compile error when using toolchains based on GCC 4.7. - -Upstream-Status: Pending - -Signed-off-by: Ken Werner <ken.werner@linaro.org> - -Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h -=================================================================== ---- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h -+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h -@@ -57,9 +57,7 @@ namespace JSC { - - class JSGlobalObject : public JSVariableObject { - protected: -- using JSVariableObject::JSVariableObjectData; -- -- struct JSGlobalObjectData : public JSVariableObjectData { -+ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData { - // We use an explicit destructor function pointer instead of a - // virtual destructor because we want to avoid adding a vtable - // pointer to this struct. Adding a vtable pointer would force the -Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h -=================================================================== ---- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h -+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h -@@ -32,8 +32,7 @@ namespace JSC{ - - class JSStaticScopeObject : public JSVariableObject { - protected: -- using JSVariableObject::JSVariableObjectData; -- struct JSStaticScopeObjectData : public JSVariableObjectData { -+ struct JSStaticScopeObjectData : public JSVariableObjectData::JSVariableObjectData { - JSStaticScopeObjectData() - : JSVariableObjectData(&symbolTable, ®isterStore + 1) - { |
