diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.6/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.6/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch new file mode 100644 index 0000000000..a83d2470a1 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.6/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch | |||
@@ -0,0 +1,63 @@ | |||
1 | From 1f1da2f24d3028b250dbc2e98e2b7e37862b3771 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Wed, 26 Sep 2012 20:54:38 +0200 | ||
4 | Subject: [PATCH 19/21] Fixes for gcc 4.7.0, particularly on qemux86 | ||
5 | |||
6 | Origin: upstream, http://trac.webkit.org/changeset/93631 | ||
7 | Origin: upstream, http://trac.webkit.org/changeset/113848 | ||
8 | |||
9 | Bug: https://bugs.webkit.org/show_bug.cgi?id=62168 | ||
10 | Bug: https://bugs.webkit.org/show_bug.cgi?id=83584 | ||
11 | |||
12 | RP 2012/04/30 | ||
13 | |||
14 | Upstream-Status: Backport | ||
15 | |||
16 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
17 | --- | ||
18 | src/3rdparty/webkit/Source/WebCore/dom/Element.cpp | 2 +- | ||
19 | src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp | 2 +- | ||
20 | .../webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h | 1 + | ||
21 | 3 files changed, 3 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp b/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp | ||
24 | index 32e47ca..b8e7389 100644 | ||
25 | --- a/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp | ||
26 | +++ b/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp | ||
27 | @@ -1080,7 +1080,7 @@ void Element::recalcStyle(StyleChange change) | ||
28 | { | ||
29 | // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called. | ||
30 | RefPtr<RenderStyle> currentStyle(renderStyle()); | ||
31 | - bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false; | ||
32 | + bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast<bool>(parentNodeForRenderingAndStyle()->renderStyle()) : false; | ||
33 | bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules(); | ||
34 | bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules(); | ||
35 | |||
36 | diff --git a/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp b/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp | ||
37 | index d66075e..ab8f111 100644 | ||
38 | --- a/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp | ||
39 | +++ b/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp | ||
40 | @@ -74,7 +74,7 @@ PassRefPtr<HTMLImageElement> HTMLImageElement::createForJSConstructor(Document* | ||
41 | RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document)); | ||
42 | if (optionalWidth) | ||
43 | image->setWidth(*optionalWidth); | ||
44 | - if (optionalHeight > 0) | ||
45 | + if (optionalHeight) | ||
46 | image->setHeight(*optionalHeight); | ||
47 | return image.release(); | ||
48 | } | ||
49 | diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h | ||
50 | index 6087ec3..6d748f6 100644 | ||
51 | --- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h | ||
52 | +++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h | ||
53 | @@ -25,6 +25,7 @@ namespace WebCore { | ||
54 | #if ENABLE(TILED_BACKING_STORE) | ||
55 | class TiledBackingStoreClient { | ||
56 | public: | ||
57 | + virtual ~TiledBackingStoreClient() { } | ||
58 | virtual void tiledBackingStorePaintBegin() = 0; | ||
59 | virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0; | ||
60 | virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) = 0; | ||
61 | -- | ||
62 | 1.8.0 | ||
63 | |||