summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4.inc1
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4/gcc47-fix.patch67
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb2
4 files changed, 70 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
index f8956f7bb5..6ea9efcf86 100644
--- a/meta/recipes-qt/qt4/qt-4.7.4.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
@@ -20,6 +20,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
20 file://g++.conf \ 20 file://g++.conf \
21 file://linux.conf \ 21 file://linux.conf \
22 file://fix-qtbug-20925.patch \ 22 file://fix-qtbug-20925.patch \
23 file://gcc47-fix.patch \
23 " 24 "
24 25
25SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf" 26SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf"
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/gcc47-fix.patch b/meta/recipes-qt/qt4/qt-4.7.4/gcc47-fix.patch
new file mode 100644
index 0000000000..1a7362675f
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.4/gcc47-fix.patch
@@ -0,0 +1,67 @@
1Fix compiler errors e.g.
2
3| ../3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h:270:100: error: invalid static_cast from type 'QTJSC::JSVariableObject::JSVariableObjectData* const' to type 'QTJSC::JSGlobalObject::JSGlobalObjectData*'
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Upstream-Status: Pending
8
9Index: qt-everywhere-opensource-src-4.7.4/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
10===================================================================
11--- qt-everywhere-opensource-src-4.7.4.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-30 15:29:20.733188940 -0700
12+++ qt-everywhere-opensource-src-4.7.4/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-30 15:29:46.525190187 -0700
13@@ -57,9 +57,8 @@
14
15 class JSGlobalObject : public JSVariableObject {
16 protected:
17- using JSVariableObject::JSVariableObjectData;
18
19- struct JSGlobalObjectData : public JSVariableObjectData {
20+ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData {
21 // We use an explicit destructor function pointer instead of a
22 // virtual destructor because we want to avoid adding a vtable
23 // pointer to this struct. Adding a vtable pointer would force the
24Index: qt-everywhere-opensource-src-4.7.4/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
25===================================================================
26--- qt-everywhere-opensource-src-4.7.4.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-30 15:31:40.713195714 -0700
27+++ qt-everywhere-opensource-src-4.7.4/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-30 15:32:01.449196717 -0700
28@@ -32,8 +32,7 @@
29
30 class JSStaticScopeObject : public JSVariableObject {
31 protected:
32- using JSVariableObject::JSVariableObjectData;
33- struct JSStaticScopeObjectData : public JSVariableObjectData {
34+ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData {
35 JSStaticScopeObjectData()
36 : JSVariableObjectData(&symbolTable, &registerStore + 1)
37 {
38Index: qt-everywhere-opensource-src-4.7.4/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h
39===================================================================
40--- qt-everywhere-opensource-src-4.7.4.orig/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-30 15:46:29.841238746 -0700
41+++ qt-everywhere-opensource-src-4.7.4/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-30 15:47:19.525241150 -0700
42@@ -57,7 +57,7 @@
43 protected:
44 using JSVariableObject::JSVariableObjectData;
45
46- struct JSGlobalObjectData : public JSVariableObjectData {
47+ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData {
48 // We use an explicit destructor function pointer instead of a
49 // virtual destructor because we want to avoid adding a vtable
50 // pointer to this struct. Adding a vtable pointer would force the
51Index: qt-everywhere-opensource-src-4.7.4/src/3rdparty/webkit/JavaScriptCore/runtime/JSStaticScopeObject.h
52===================================================================
53--- qt-everywhere-opensource-src-4.7.4.orig/src/3rdparty/webkit/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-30 15:47:50.789242663 -0700
54+++ qt-everywhere-opensource-src-4.7.4/src/3rdparty/webkit/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-30 16:25:51.465353133 -0700
55@@ -32,10 +32,9 @@
56
57 class JSStaticScopeObject : public JSVariableObject {
58 protected:
59- using JSVariableObject::JSVariableObjectData;
60- struct JSStaticScopeObjectData : public JSVariableObjectData {
61+ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData {
62 JSStaticScopeObjectData()
63- : JSVariableObjectData(&symbolTable, &registerStore + 1)
64+ : JSVariableObject::JSVariableObjectData(&symbolTable, &registerStore + 1)
65 {
66 }
67 SymbolTable symbolTable;
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
index a1fcafb0a0..75b2cee587 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
@@ -1,7 +1,7 @@
1require qt-${PV}.inc 1require qt-${PV}.inc
2require qt4-embedded.inc 2require qt4-embedded.inc
3 3
4PR = "${INC_PR}.7" 4PR = "${INC_PR}.8"
5 5
6QT_CONFIG_FLAGS_append_armv6 = " -no-neon " 6QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
7 7
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
index e7f848e889..e845759a08 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
@@ -1,7 +1,7 @@
1require qt4-x11-free.inc 1require qt4-x11-free.inc
2require qt-${PV}.inc 2require qt-${PV}.inc
3 3
4PR = "${INC_PR}.7" 4PR = "${INC_PR}.8"
5 5
6QT_CONFIG_FLAGS_append_armv6 = " -no-neon " 6QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
7 7