summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch')
-rw-r--r--recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
deleted file mode 100644
index d355e488..00000000
--- a/recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 6d28b0ec1bc93fea7502fadfbc12f8198ccf9d14 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com>
3Date: Wed, 5 Jun 2013 19:23:32 +0200
4Subject: [PATCH 3/3] Fix wrong calculation of viewPort for transitions
5
6Viewport is calculated wrong for horizontal layout in a second instance
7
8Task-number: QTBUG-29944
9Task-Number: QTBUG-31546
10
11Upstream-Status: Pending
12
13Looks like backport of https://codereview.qt-project.org/49226 but this
14one was applied in previous patch, this change looks the same but is
15in different part of qquickitemview.cpp and ISN'T applied yet in dev
16branch.
17
18Signed-off-by: Florian Haenel <florian.haenel@lge.com>
19Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20
21Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe
22---
23 src/quick/items/qquickitemview.cpp | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
26diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
27index a6dabee..290f283 100644
28--- a/src/quick/items/qquickitemview.cpp
29+++ b/src/quick/items/qquickitemview.cpp
30@@ -1815,7 +1815,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--
401.8.3.2
41