summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1.inc1
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix2.patch50
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4-native_4.8.1.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb2
6 files changed, 55 insertions, 4 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.1.inc b/meta/recipes-qt/qt4/qt-4.8.1.inc
index b42ca0106e..8c38caee3c 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1.inc
+++ b/meta/recipes-qt/qt4/qt-4.8.1.inc
@@ -21,6 +21,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
21 file://g++.conf \ 21 file://g++.conf \
22 file://linux.conf \ 22 file://linux.conf \
23 file://gcc47-fix.patch \ 23 file://gcc47-fix.patch \
24 file://gcc47-fix2.patch \
24 file://disable-fuse-gold-flag.patch \ 25 file://disable-fuse-gold-flag.patch \
25 " 26 "
26 27
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix2.patch b/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix2.patch
new file mode 100644
index 0000000000..09513b6ae7
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix2.patch
@@ -0,0 +1,50 @@
1Fixes for gcc 4.7.0, particularly on qemux86
2
3Origin: upstream, http://trac.webkit.org/changeset/93631
4Origin: upstream, http://trac.webkit.org/changeset/113848
5
6Bug: https://bugs.webkit.org/show_bug.cgi?id=62168
7Bug: https://bugs.webkit.org/show_bug.cgi?id=83584
8
9RP 2012/04/30
10
11Upstream-Status: Backport
12
13Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
14===================================================================
15--- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp 2012-04-30 09:15:17.000000000 +0000
16+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp 2012-04-30 09:22:04.586008994 +0000
17@@ -1080,7 +1080,7 @@
18 {
19 // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.
20 RefPtr<RenderStyle> currentStyle(renderStyle());
21- bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false;
22+ bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast<bool>(parentNodeForRenderingAndStyle()->renderStyle()) : false;
23 bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
24 bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();
25
26Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
27===================================================================
28--- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp 2012-03-14 14:01:19.000000000 +0000
29+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp 2012-04-30 09:22:04.586008994 +0000
30@@ -74,7 +74,7 @@
31 RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document));
32 if (optionalWidth)
33 image->setWidth(*optionalWidth);
34- if (optionalHeight > 0)
35+ if (optionalHeight)
36 image->setHeight(*optionalHeight);
37 return image.release();
38 }
39Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
40===================================================================
41--- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h 2012-03-14 14:01:24.000000000 +0000
42+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h 2012-04-30 09:22:04.590008963 +0000
43@@ -25,6 +25,7 @@
44 #if ENABLE(TILED_BACKING_STORE)
45 class TiledBackingStoreClient {
46 public:
47+ virtual ~TiledBackingStoreClient() { }
48 virtual void tiledBackingStorePaintBegin() = 0;
49 virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0;
50 virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) = 0;
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb
index e16264c377..668565e189 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.1.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}.0" 4PR = "${INC_PR}.1"
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-native_4.8.1.bb b/meta/recipes-qt/qt4/qt4-native_4.8.1.bb
index 533b5d6675..a2a1dbda93 100644
--- a/meta/recipes-qt/qt4/qt4-native_4.8.1.bb
+++ b/meta/recipes-qt/qt4/qt4-native_4.8.1.bb
@@ -1,6 +1,6 @@
1require qt4-native.inc 1require qt4-native.inc
2 2
3PR = "${INC_PR}.0" 3PR = "${INC_PR}.1"
4 4
5# Find the g++.conf/linux.conf in the right directory. 5# Find the g++.conf/linux.conf in the right directory.
6FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" 6FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb
index c4bd3cfdc3..e17a8ad808 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb
@@ -1,6 +1,6 @@
1require qt4-tools-nativesdk.inc 1require qt4-tools-nativesdk.inc
2 2
3PR = "${INC_PR}.0" 3PR = "${INC_PR}.1"
4 4
5SRC_URI += "file://qmake_pri_fixes.patch" 5SRC_URI += "file://qmake_pri_fixes.patch"
6 6
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb
index 7afb51fea8..6978053692 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.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}.0" 4PR = "${INC_PR}.1"
5 5
6QT_CONFIG_FLAGS_append_armv6 = " -no-neon " 6QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
7 7