diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 21:00:04 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:17 +0100 |
commit | 24bf06bbcda4c0dfdad33cdff6394faa52657bb9 (patch) | |
tree | 5c841fe411948bacc3716fb2509e3d9c4c1a391a /meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch | |
parent | 5f0684c1d23a3520095a4d450a0c1fa95fa1c7b2 (diff) | |
download | openembedded-core-24bf06bbcda4c0dfdad33cdff6394faa52657bb9.tar.gz openembedded-core-24bf06bbcda4c0dfdad33cdff6394faa52657bb9.tar.bz2 openembedded-core-24bf06bbcda4c0dfdad33cdff6394faa52657bb9.zip |
qt4: replace all local patches with git patches with headers
* in preparation for upgrade to 4.8.3
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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 @@ -Fixes for gcc 4.7.0, particularly on qemux86 - -Origin: upstream, http://trac.webkit.org/changeset/93631 -Origin: upstream, http://trac.webkit.org/changeset/113848 - -Bug: https://bugs.webkit.org/show_bug.cgi?id=62168 -Bug: https://bugs.webkit.org/show_bug.cgi?id=83584 - -RP 2012/04/30 - -Upstream-Status: Backport - -Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp -=================================================================== ---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp 2012-04-30 09:15:17.000000000 +0000 -+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp 2012-04-30 09:22:04.586008994 +0000 -@@ -1080,7 +1080,7 @@ - { - // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called. - RefPtr<RenderStyle> currentStyle(renderStyle()); -- bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false; -+ bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast<bool>(parentNodeForRenderingAndStyle()->renderStyle()) : false; - bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules(); - bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules(); - -Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp -=================================================================== ---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp 2012-03-14 14:01:19.000000000 +0000 -+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp 2012-04-30 09:22:04.586008994 +0000 -@@ -74,7 +74,7 @@ - RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document)); - if (optionalWidth) - image->setWidth(*optionalWidth); -- if (optionalHeight > 0) -+ if (optionalHeight) - image->setHeight(*optionalHeight); - return image.release(); - } -Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h -=================================================================== ---- 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 -+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h 2012-04-30 09:22:04.590008963 +0000 -@@ -25,6 +25,7 @@ - #if ENABLE(TILED_BACKING_STORE) - class TiledBackingStoreClient { - public: -+ virtual ~TiledBackingStoreClient() { } - virtual void tiledBackingStorePaintBegin() = 0; - virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0; - virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) = 0; |