diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch deleted file mode 100644 index 09513b6ae7..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | Fixes for gcc 4.7.0, particularly on qemux86 | ||
2 | |||
3 | Origin: upstream, http://trac.webkit.org/changeset/93631 | ||
4 | Origin: upstream, http://trac.webkit.org/changeset/113848 | ||
5 | |||
6 | Bug: https://bugs.webkit.org/show_bug.cgi?id=62168 | ||
7 | Bug: https://bugs.webkit.org/show_bug.cgi?id=83584 | ||
8 | |||
9 | RP 2012/04/30 | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | |||
13 | Index: 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 | |||
26 | Index: 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 | } | ||
39 | Index: 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; | ||