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/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.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/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch b/recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch deleted file mode 100644 index 6858cead..00000000 --- a/recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From af96c6fed931564c95037539f07e9c8e33c69529 Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Hartmann <phartmann@blackberry.com> | ||
3 | Date: Thu, 25 Jul 2013 12:05:29 -0400 | ||
4 | Subject: [PATCH] QHttpMultiPart: fix data corruption in readData method | ||
5 | |||
6 | When readData() is called repeatedly, we need to keep track which | ||
7 | part of the multipart message we are currently reading from. | ||
8 | Hereby we also need to take the boundary size into account, and not | ||
9 | only the size of the multipart; otherwise we would skip a not | ||
10 | completely read part. This would then later lead to advancing the | ||
11 | read pointer by negative indexes and data loss. | ||
12 | |||
13 | Upstream-Status: Accepted [https://codereview.qt-project.org/#change,61698] | ||
14 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
15 | |||
16 | Task-number: QTBUG-32534 | ||
17 | Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0 | ||
18 | Reviewed-by: Jonathan Liu <net147@gmail.com> | ||
19 | Reviewed-by: Shane Kearns <shane.kearns@accenture.com> | ||
20 | --- | ||
21 | src/network/access/qhttpmultipart.cpp | 3 +- | ||
22 | .../access/qnetworkreply/tst_qnetworkreply.cpp | 44 ++++++++++++++++++++++ | ||
23 | 2 files changed, 46 insertions(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp | ||
26 | index 4397ef8..5985ed9 100644 | ||
27 | --- a/src/network/access/qhttpmultipart.cpp | ||
28 | +++ b/src/network/access/qhttpmultipart.cpp | ||
29 | @@ -497,7 +497,8 @@ qint64 QHttpMultiPartIODevice::readData(char *data, qint64 maxSize) | ||
30 | |||
31 | // skip the parts we have already read | ||
32 | while (index < multiPart->parts.count() && | ||
33 | - readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size()) | ||
34 | + readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size() | ||
35 | + + multiPart->boundary.count() + 6) // 6 == 2 boundary dashes, \r\n after boundary, \r\n after multipart | ||
36 | index++; | ||
37 | |||
38 | // read the data | ||
39 | -- | ||
40 | 1.8.3.4 | ||
41 | |||