qtbase: add upstream QTBUG-31579 patch for QPainter regression

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Jonathan Liu 2013-10-09 13:20:56 +00:00 committed by Martin Jansa
parent ee4ef2a303
commit 096a380851
3 changed files with 95 additions and 0 deletions

View File

@ -0,0 +1,47 @@
From f0b950144dde85b65df0c3cf83f7c8df0e94bbbf 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,67578]
Signed-off-by: Jonathan Liu <net147@gmail.com>
Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
---
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 39f6422..a2301e3 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

View File

@ -0,0 +1,47 @@
From f0b950144dde85b65df0c3cf83f7c8df0e94bbbf 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,67578]
Signed-off-by: Jonathan Liu <net147@gmail.com>
Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
---
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 39f6422..a2301e3 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

View File

@ -22,6 +22,7 @@ SRC_URI += " \
file://0022-configure-make-alsa-a-configurable-option.patch \
file://0023-configure-make-freetype-a-configurable-option.patch \
file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \
file://0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch \
"
DEPENDS += "qtbase-native"