diff options
| author | Jonathan Liu <net147@gmail.com> | 2013-10-09 13:21:46 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-14 16:54:28 +0100 |
| commit | a5afc67cbfc32beb3be10392bf9788cfc3610ab1 (patch) | |
| tree | 36c52b89962316f45d591e191bafdb5f8ccb588f /meta | |
| parent | f93ac05acafb9ebf4fa4f35e4f1b7780d3d8a5e9 (diff) | |
| download | openembedded-core-a5afc67cbfc32beb3be10392bf9788cfc3610ab1.tar.gz openembedded-core-a5afc67cbfc32beb3be10392bf9788cfc3610ab1.tar.bz2 openembedded-core-a5afc67cbfc32beb3be10392bf9788cfc3610ab1.zip | |
qt4: add upstream QTBUG-31579 patch for QPainter regression
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.5.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.5/0024-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch | 48 |
2 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5.inc b/meta/recipes-qt/qt4/qt4-4.8.5.inc index 95a14f3ddd..99359927cb 100644 --- a/meta/recipes-qt/qt4/qt4-4.8.5.inc +++ b/meta/recipes-qt/qt4/qt4-4.8.5.inc @@ -23,6 +23,7 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever file://0020-webkit-disable-the-fuse-ld-gold-flag.patch \ file://0022-Fix-drawing-of-0-width-polylines-from-outside-the-de.patch \ file://0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch \ + file://0024-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch \ file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \ file://g++.conf \ file://linux.conf \ diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0024-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0024-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch new file mode 100644 index 0000000000..7825205310 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.5/0024-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch @@ -0,0 +1,48 @@ +From 0726127285413829f58618b5b82fb3e2da0c3a74 Mon Sep 17 00:00:00 2001 +From: Andy Shaw <andy.shaw@digia.com> +Date: Tue, 8 Oct 2013 15:45:42 +0200 +Subject: [PATCH] Ensure lastPixel.y is also initalized to -1 when necessary + +Task-number: QTBUG-31579 + +Upstream-Status: Accepted [https://codereview.qt-project.org/#change,67624] +Signed-off-by: Jonathan Liu <net147@gmail.com> + +Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e +Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> +(cherry picked from qtbase/f0b950144dde85b65df0c3cf83f7c8df0e94bbbf) +--- + src/gui/painting/qcosmeticstroker.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp +index 4413170..36616d4 100644 +--- a/src/gui/painting/qcosmeticstroker.cpp ++++ b/src/gui/painting/qcosmeticstroker.cpp +@@ -305,6 +305,7 @@ void QCosmeticStroker::setup() + ymax = deviceRect.bottom() + 2; + + lastPixel.x = -1; ++ lastPixel.y = -1; + } + + // returns true if the whole line gets clipped away +@@ -533,6 +534,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) + QPointF p = QPointF(points[0], points[1]) * state->matrix; + patternOffset = state->lastPen.dashOffset()*64; + lastPixel.x = -1; ++ lastPixel.y = -1; + + bool closed; + const QPainterPath::ElementType *e = subPath(type, end, points, &closed); +@@ -587,6 +589,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) + QPointF movedTo = p; + patternOffset = state->lastPen.dashOffset()*64; + lastPixel.x = -1; ++ lastPixel.y = -1; + + const qreal *begin = points; + const qreal *end = points + 2*path.elementCount(); +-- +1.8.4 + |