diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-11-02 19:06:14 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-01-12 15:01:37 +0100 |
commit | c908fe4ebd5a04813be0b83c173fae182bb22728 (patch) | |
tree | ac8f089c2dce89598cf96532eac24cfb33567e4b /recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch | |
parent | 775d77e482f1ea203c78003cccd2547075fd720f (diff) | |
download | meta-qt5-c908fe4ebd5a04813be0b83c173fae182bb22728.tar.gz |
qt5: upgrade to 5.2.0
* drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch
resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5
* drop 0020-Use-BGRA-extension-in-bindTexture.patch
resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c
* drop 0008-wayland-scanner-disable-silent-rules.patch
resolved upstream in:
commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c
Author: Jan Arne Petersen <jan.petersen@kdab.com>
Date: Fri Jul 19 14:35:19 2013 +0200
Fix wayland-scanner to work with CONFIG+=silent
* squash to match more with structure of
https://github.com/meta-qt5/qtbase/tree/stable
* qtmodules: bump SRCREVs for 5.2.0 tags
now all modules using qt5-git should be newer than any 5.1.* version
* qtbase: fix paths in packageconfig *.pc files
include- and lib-paths contained build-sysroot paths
* qtwebkit: Explicitly add ICU libraries to LIBS
fails to build without this
* qtjsbackend: remove for git versions
Found in [1]:
Qt Qml is now using its own built-in Javascript engine and does not depend on
V8 anymore. As such the QtJSBackend shared library has disappeared.
[1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/
* qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes
qtjsbackend is now completely gone
it allows to share more .patch files and configuration in .inc again
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch b/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch deleted file mode 100644 index 0d533059..00000000 --- a/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From f0b950144dde85b65df0c3cf83f7c8df0e94bbbf Mon Sep 17 00:00:00 2001 | ||
2 | From: Andy Shaw <andy.shaw@digia.com> | ||
3 | Date: Tue, 8 Oct 2013 15:45:42 +0200 | ||
4 | Subject: [PATCH] Ensure lastPixel.y is also initalized to -1 when necessary | ||
5 | |||
6 | Task-number: QTBUG-31579 | ||
7 | |||
8 | Upstream-Status: Accepted [https://codereview.qt-project.org/#change,67578] | ||
9 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
10 | |||
11 | Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e | ||
12 | Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> | ||
13 | --- | ||
14 | src/gui/painting/qcosmeticstroker.cpp | 3 +++ | ||
15 | 1 file changed, 3 insertions(+) | ||
16 | |||
17 | diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp | ||
18 | index 39f6422..a2301e3 100644 | ||
19 | --- a/src/gui/painting/qcosmeticstroker.cpp | ||
20 | +++ b/src/gui/painting/qcosmeticstroker.cpp | ||
21 | @@ -305,6 +305,7 @@ void QCosmeticStroker::setup() | ||
22 | ymax = deviceRect.bottom() + 2; | ||
23 | |||
24 | lastPixel.x = -1; | ||
25 | + lastPixel.y = -1; | ||
26 | } | ||
27 | |||
28 | // returns true if the whole line gets clipped away | ||
29 | @@ -533,6 +534,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) | ||
30 | QPointF p = QPointF(points[0], points[1]) * state->matrix; | ||
31 | patternOffset = state->lastPen.dashOffset()*64; | ||
32 | lastPixel.x = -1; | ||
33 | + lastPixel.y = -1; | ||
34 | |||
35 | bool closed; | ||
36 | const QPainterPath::ElementType *e = subPath(type, end, points, &closed); | ||
37 | @@ -587,6 +589,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) | ||
38 | QPointF movedTo = p; | ||
39 | patternOffset = state->lastPen.dashOffset()*64; | ||
40 | lastPixel.x = -1; | ||
41 | + lastPixel.y = -1; | ||
42 | |||
43 | const qreal *begin = points; | ||
44 | const qreal *end = points + 2*path.elementCount(); | ||
45 | -- | ||
46 | 1.8.4 | ||
47 | |||