summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtdeclarative
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-02-07 04:10:06 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-02-19 11:56:32 +0100
commit4b7182a3be2b591e8190ff15b7a121191e4b201f (patch)
treec518a426110cae5e5355dc5d02bdcf60a2cf2834 /recipes-qt/qt5/qtdeclarative
parent79944bda32a7e4799e7e73ea5b0dfc71ff1fc172 (diff)
downloadmeta-qt5-4b7182a3be2b591e8190ff15b7a121191e4b201f.tar.gz
qt5: Upgrade from 5.2.0 to 5.2.1
* qtwayland: Use default LICENSE and LIC_FILES_CHKSUM * license texts were added in qtwayland commit 26bdc66fe6c4499332b2ead886a806d09aa07a8a * qtdeclarative, qtserialport: Update QT_MODULE_BRANCH * SHA-1 of v5.2.1 tag is only in release branch Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative')
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch11
-rw-r--r--recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch8
2 files changed, 9 insertions, 10 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
index 7a68dd53..f1393785 100644
--- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
+++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
@@ -1,7 +1,7 @@
1From ea698b0a2588585356d1ea5139ca6feb7110611a Mon Sep 17 00:00:00 2001 1From 6e3f95ab76c4de1333eab1625b507c09ad52d340 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> 2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sun, 26 May 2013 14:26:19 +0200 3Date: Sun, 26 May 2013 14:26:19 +0200
4Subject: [PATCH 1/3] qmltestexample: fix link 4Subject: [PATCH 1/2] qmltestexample: fix link
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -13,9 +13,8 @@ Upstream-Status: Inappropriate
13 13
14Signed-off-by: Eric Bénard <eric@eukrea.com> 14Signed-off-by: Eric Bénard <eric@eukrea.com>
15--- 15---
16 examples/qmltest/qmltest/qmltest.pro | 2 +- 16 examples/qmltest/qmltest/qmltest.pro | 2 +-
17 tools/qmltestrunner/qmltestrunner.pro | 2 +- 17 1 file changed, 1 insertion(+), 1 deletion(-)
18 2 files changed, 2 insertions(+), 2 deletions(-)
19 18
20diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro 19diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
21index b5893c5..1b00e6c 100644 20index b5893c5..1b00e6c 100644
@@ -42,5 +41,5 @@ index 5184c1f..668cf17 100644
42 41
43 load(qt_tool) 42 load(qt_tool)
44-- 43--
451.8.3.2 441.8.5.3
46 45
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
index 84f8f661..5643634c 100644
--- 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
@@ -1,4 +1,4 @@
1From 3919fe89e7adbc9f163eabce9269a924273c64ec Mon Sep 17 00:00:00 2001 1From a13535b21b8406d65c8f139306d8324bda05443b Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com> 2From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com>
3Date: Wed, 5 Jun 2013 19:23:32 +0200 3Date: Wed, 5 Jun 2013 19:23:32 +0200
4Subject: [PATCH 2/2] Fix wrong calculation of viewPort for transitions 4Subject: [PATCH 2/2] Fix wrong calculation of viewPort for transitions
@@ -24,10 +24,10 @@ Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe
24 1 file changed, 1 insertion(+), 1 deletion(-) 24 1 file changed, 1 insertion(+), 1 deletion(-)
25 25
26diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp 26diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
27index a6dabee..290f283 100644 27index d7b9847..a54d282 100644
28--- a/src/quick/items/qquickitemview.cpp 28--- a/src/quick/items/qquickitemview.cpp
29+++ b/src/quick/items/qquickitemview.cpp 29+++ b/src/quick/items/qquickitemview.cpp
30@@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout() 30@@ -1835,7 +1835,7 @@ void QQuickItemViewPrivate::layout()
31 31
32 prepareVisibleItemTransitions(); 32 prepareVisibleItemTransitions();
33 33
@@ -37,5 +37,5 @@ index a6dabee..290f283 100644
37 it != releasePendingTransition.end(); ) { 37 it != releasePendingTransition.end(); ) {
38 FxViewItem *item = *it; 38 FxViewItem *item = *it;
39-- 39--
401.8.3.2 401.8.5.3
41 41