diff options
author | Jonathan Liu <net147@gmail.com> | 2014-05-30 00:54:38 +1000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-10 12:11:51 +0200 |
commit | e9ad98bbed6065989ef4648e724f27275b35b838 (patch) | |
tree | 8718538fb4ac8badfbb620f11a13b8ca31b03725 /recipes-qt/qt5/qtdeclarative | |
parent | 6374736f37378501793a5191b48545c1fecc0c48 (diff) | |
download | meta-qt5-e9ad98bbed6065989ef4648e724f27275b35b838.tar.gz |
qt5: upgrade from 5.2.1 to 5.3.0
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative')
-rw-r--r-- | recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch | 60 | ||||
-rw-r--r-- | recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch | 41 |
2 files changed, 60 insertions, 41 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch b/recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch new file mode 100644 index 00000000..821149f2 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From 009ad875f89d7d7bc4447e18c2fbbd485a75e0b5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Oleg Shparber <trollixx@gmail.com> | ||
3 | Date: Mon, 19 May 2014 00:53:39 -0700 | ||
4 | Subject: [PATCH] Fix improper antialiasing property behavior | ||
5 | |||
6 | For components antialiased by default the property was returned | ||
7 | as false if default true value was set to true again. | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | |||
11 | Task-number: QTBUG-39047 | ||
12 | Change-Id: I16960a12b6d38a0d9e487fc6612610c39c4949d4 | ||
13 | Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> | ||
14 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
15 | --- | ||
16 | src/quick/items/qquickitem.cpp | 8 +++++--- | ||
17 | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 7 +++++++ | ||
18 | 2 files changed, 12 insertions(+), 3 deletions(-) | ||
19 | |||
20 | diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp | ||
21 | index 3f0dae8..ef2eac4 100644 | ||
22 | --- a/src/quick/items/qquickitem.cpp | ||
23 | +++ b/src/quick/items/qquickitem.cpp | ||
24 | @@ -5691,10 +5691,12 @@ void QQuickItem::setAntialiasing(bool aa) | ||
25 | { | ||
26 | Q_D(QQuickItem); | ||
27 | |||
28 | - bool changed = (aa != antialiasing()); | ||
29 | - d->antialiasingValid = true; | ||
30 | + if (!d->antialiasingValid) { | ||
31 | + d->antialiasingValid = true; | ||
32 | + d->antialiasing = d->implicitAntialiasing; | ||
33 | + } | ||
34 | |||
35 | - if (!changed) | ||
36 | + if (aa == d->antialiasing) | ||
37 | return; | ||
38 | |||
39 | d->antialiasing = aa; | ||
40 | diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp | ||
41 | index 0b69981..d36c55d 100644 | ||
42 | --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp | ||
43 | +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp | ||
44 | @@ -1334,6 +1334,13 @@ void tst_qquicktext::antialiasing() | ||
45 | text->resetAntialiasing(); | ||
46 | QCOMPARE(text->antialiasing(), true); | ||
47 | QCOMPARE(spy.count(), 2); | ||
48 | + | ||
49 | + // QTBUG-39047 | ||
50 | + component.setData("import QtQuick 2.0\n Text { antialiasing: true }", QUrl()); | ||
51 | + object.reset(component.create()); | ||
52 | + text = qobject_cast<QQuickText *>(object.data()); | ||
53 | + QVERIFY(text); | ||
54 | + QCOMPARE(text->antialiasing(), true); | ||
55 | } | ||
56 | |||
57 | void tst_qquicktext::weight() | ||
58 | -- | ||
59 | 1.9.3 | ||
60 | |||
diff --git a/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch deleted file mode 100644 index 5643634c..00000000 --- a/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From a13535b21b8406d65c8f139306d8324bda05443b Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com> | ||
3 | Date: Wed, 5 Jun 2013 19:23:32 +0200 | ||
4 | Subject: [PATCH 2/2] Fix wrong calculation of viewPort for transitions | ||
5 | |||
6 | Viewport is calculated wrong for horizontal layout in a second instance | ||
7 | |||
8 | Task-number: QTBUG-29944 | ||
9 | Task-Number: QTBUG-31546 | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Looks like backport of https://codereview.qt-project.org/49226 but this | ||
14 | one was applied in previous patch, this change looks the same but is | ||
15 | in different part of qquickitemview.cpp and ISN'T applied yet in dev | ||
16 | branch. | ||
17 | |||
18 | Signed-off-by: Florian Haenel <florian.haenel@lge.com> | ||
19 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
20 | |||
21 | Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe | ||
22 | --- | ||
23 | src/quick/items/qquickitemview.cpp | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp | ||
27 | index d7b9847..a54d282 100644 | ||
28 | --- a/src/quick/items/qquickitemview.cpp | ||
29 | +++ b/src/quick/items/qquickitemview.cpp | ||
30 | @@ -1835,7 +1835,7 @@ void QQuickItemViewPrivate::layout() | ||
31 | |||
32 | prepareVisibleItemTransitions(); | ||
33 | |||
34 | - QRectF viewBounds(0, position(), q->width(), q->height()); | ||
35 | + QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height()); | ||
36 | for (QList<FxViewItem*>::Iterator it = releasePendingTransition.begin(); | ||
37 | it != releasePendingTransition.end(); ) { | ||
38 | FxViewItem *item = *it; | ||
39 | -- | ||
40 | 1.8.5.3 | ||
41 | |||