summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtdeclarative-git
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative-git')
-rw-r--r--recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch46
-rw-r--r--recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch41
2 files changed, 0 insertions, 87 deletions
diff --git a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch
deleted file mode 100644
index 7a68dd53..00000000
--- a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From ea698b0a2588585356d1ea5139ca6feb7110611a Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sun, 26 May 2013 14:26:19 +0200
4Subject: [PATCH 1/3] qmltestexample: fix link
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9else we get :
10ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found
11
12Upstream-Status: Inappropriate
13
14Signed-off-by: Eric Bénard <eric@eukrea.com>
15---
16 examples/qmltest/qmltest/qmltest.pro | 2 +-
17 tools/qmltestrunner/qmltestrunner.pro | 2 +-
18 2 files changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
21index b5893c5..1b00e6c 100644
22--- a/examples/qmltest/qmltest/qmltest.pro
23+++ b/examples/qmltest/qmltest/qmltest.pro
24@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml
25 # This code exists solely for the purpose of building this example
26 # inside the examples/ hierarchy.
27
28-QT += qml qmltest
29+QT += qml qmltest quick
30
31 macx: CONFIG -= app_bundle
32
33diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro
34index 5184c1f..668cf17 100644
35--- a/tools/qmltestrunner/qmltestrunner.pro
36+++ b/tools/qmltestrunner/qmltestrunner.pro
37@@ -1,5 +1,5 @@
38 SOURCES += main.cpp
39
40-QT += qml qmltest
41+QT += qml qmltest quick
42
43 load(qt_tool)
44--
451.8.3.2
46
diff --git a/recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
deleted file mode 100644
index 84f8f661..00000000
--- a/recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 3919fe89e7adbc9f163eabce9269a924273c64ec 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 2/2] 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