summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-10-09 13:21:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-12 16:59:53 +0000
commitb5c4bad0bfac3908d021b7b02caa5ae9ff96c185 (patch)
treec42373e44d5ebd80cd52e36d11f4f1c3b49e5eb8
parentce15d9a1e501b7dc71130119f932116e74a2e391 (diff)
downloadpoky-b5c4bad0bfac3908d021b7b02caa5ae9ff96c185.tar.gz
qt4: add upstream QTBUG-31579 patch for QPainter regression
(From OE-Core master rev: a5afc67cbfc32beb3be10392bf9788cfc3610ab1) (From OE-Core rev: 18e49ebf8d5cc43eca417cd51cabae175f6b5ea4) 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> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5.inc1
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0024-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch48
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
23 file://0020-webkit-disable-the-fuse-ld-gold-flag.patch \ 23 file://0020-webkit-disable-the-fuse-ld-gold-flag.patch \
24 file://0022-Fix-drawing-of-0-width-polylines-from-outside-the-de.patch \ 24 file://0022-Fix-drawing-of-0-width-polylines-from-outside-the-de.patch \
25 file://0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch \ 25 file://0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch \
26 file://0024-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch \
26 file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \ 27 file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \
27 file://g++.conf \ 28 file://g++.conf \
28 file://linux.conf \ 29 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 @@
1From 0726127285413829f58618b5b82fb3e2da0c3a74 Mon Sep 17 00:00:00 2001
2From: Andy Shaw <andy.shaw@digia.com>
3Date: Tue, 8 Oct 2013 15:45:42 +0200
4Subject: [PATCH] Ensure lastPixel.y is also initalized to -1 when necessary
5
6Task-number: QTBUG-31579
7
8Upstream-Status: Accepted [https://codereview.qt-project.org/#change,67624]
9Signed-off-by: Jonathan Liu <net147@gmail.com>
10
11Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e
12Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
13(cherry picked from qtbase/f0b950144dde85b65df0c3cf83f7c8df0e94bbbf)
14---
15 src/gui/painting/qcosmeticstroker.cpp | 3 +++
16 1 file changed, 3 insertions(+)
17
18diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
19index 4413170..36616d4 100644
20--- a/src/gui/painting/qcosmeticstroker.cpp
21+++ b/src/gui/painting/qcosmeticstroker.cpp
22@@ -305,6 +305,7 @@ void QCosmeticStroker::setup()
23 ymax = deviceRect.bottom() + 2;
24
25 lastPixel.x = -1;
26+ lastPixel.y = -1;
27 }
28
29 // returns true if the whole line gets clipped away
30@@ -533,6 +534,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
31 QPointF p = QPointF(points[0], points[1]) * state->matrix;
32 patternOffset = state->lastPen.dashOffset()*64;
33 lastPixel.x = -1;
34+ lastPixel.y = -1;
35
36 bool closed;
37 const QPainterPath::ElementType *e = subPath(type, end, points, &closed);
38@@ -587,6 +589,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
39 QPointF movedTo = p;
40 patternOffset = state->lastPen.dashOffset()*64;
41 lastPixel.x = -1;
42+ lastPixel.y = -1;
43
44 const qreal *begin = points;
45 const qreal *end = points + 2*path.elementCount();
46--
471.8.4
48