mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-02 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt-4.7.4: Fix build with gcc 4.7

Browse Source 
g++ 4.7 is detecting inheritence problems
which we solve by explictly specifying
elements in constructors

(From OE-Core rev: 553ac1bf0ebf2ecf4e45ace4016b50c810ef7b26)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2012-03-30 17:27:41 -07:00
committed by Richard Purdie
parent 30b2b8fdf1
commit ca0831d92d
4 changed files with 70 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta/recipes-qt/qt4/qt-4.7.4.inc
View File

@@ -20,6 +20,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
file://g++.conf \
file://linux.conf \
file://fix-qtbug-20925.patch \
file://gcc47-fix.patch \
"
SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf"

67
meta/recipes-qt/qt4/qt-4.7.4/gcc47-fix.patch Normal file
View File

@@ -0,0 +1,67 @@
Fix compiler errors e.g.
| ../3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h:270:100: error: invalid static_cast from type 'QTJSC::JSVariableObject::JSVariableObjectData* const' to type 'QTJSC::JSGlobalObject::JSGlobalObjectData*'
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: qt-everywhere-opensource-src-4.7.4/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
===================================================================
--- qt-everywhere-opensource-src-4.7.4.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-30 15:29:20.733188940 -0700
+++ qt-everywhere-opensource-src-4.7.4/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-30 15:29:46.525190187 -0700
@@ -57,9 +57,8 @@
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.7.4/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
===================================================================
--- qt-everywhere-opensource-src-4.7.4.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-30 15:31:40.713195714 -0700
+++ qt-everywhere-opensource-src-4.7.4/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-30 15:32:01.449196717 -0700
@@ -32,8 +32,7 @@
class JSStaticScopeObject : public JSVariableObject {
protected:
- using JSVariableObject::JSVariableObjectData;
- struct JSStaticScopeObjectData : public JSVariableObjectData {
+ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData {
JSStaticScopeObjectData()
: JSVariableObjectData(&symbolTable, &registerStore + 1)
{
Index: qt-everywhere-opensource-src-4.7.4/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h
===================================================================
--- qt-everywhere-opensource-src-4.7.4.orig/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-30 15:46:29.841238746 -0700
+++ qt-everywhere-opensource-src-4.7.4/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-30 15:47:19.525241150 -0700
@@ -57,7 +57,7 @@
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.7.4/src/3rdparty/webkit/JavaScriptCore/runtime/JSStaticScopeObject.h
===================================================================
--- qt-everywhere-opensource-src-4.7.4.orig/src/3rdparty/webkit/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-30 15:47:50.789242663 -0700
+++ qt-everywhere-opensource-src-4.7.4/src/3rdparty/webkit/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-30 16:25:51.465353133 -0700
@@ -32,10 +32,9 @@
class JSStaticScopeObject : public JSVariableObject {
protected:
- using JSVariableObject::JSVariableObjectData;
- struct JSStaticScopeObjectData : public JSVariableObjectData {
+ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData {
JSStaticScopeObjectData()
- : JSVariableObjectData(&symbolTable, &registerStore + 1)
+ : JSVariableObject::JSVariableObjectData(&symbolTable, &registerStore + 1)
{
}
SymbolTable symbolTable;

2
meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
View File

@@ -1,7 +1,7 @@
require qt-${PV}.inc
require qt4-embedded.inc
PR = "${INC_PR}.7"
PR = "${INC_PR}.8"
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "

2
meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
View File

@@ -1,7 +1,7 @@
require qt4-x11-free.inc
require qt-${PV}.inc
PR = "${INC_PR}.7"
PR = "${INC_PR}.8"
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "