summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-02-24 23:55:52 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-03-05 19:31:03 +0100
commita93ebb736bb02c1c74bb8a4bd14476c725905ea3 (patch)
tree07c5e4ae2b5045aae00e0aeaa7662189de6ab27c /recipes-qt/qt5
parentfbf9216fb9753e32618f1bf986e136423171b313 (diff)
downloadmeta-qt5-a93ebb736bb02c1c74bb8a4bd14476c725905ea3.tar.gz
qtdeclarative_git: drop 0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
* drop 0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch because it's already applied in upstream commit: commit d765ad8e3dabe44f276db9084b1d16164c4535e7 Author: Florian Hänel <florian.haenel@basyskom.com> Date: Wed Jun 5 19:23:32 2013 +0200 Subject: Fix wrong calculation of viewPort for transitions Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/qtdeclarative.inc1
-rw-r--r--recipes-qt/qt5/qtdeclarative_5.2.1.bb4
2 files changed, 4 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc
index bd68955b..4a186fdc 100644
--- a/recipes-qt/qt5/qtdeclarative.inc
+++ b/recipes-qt/qt5/qtdeclarative.inc
@@ -2,7 +2,6 @@ require qt5.inc
2 2
3SRC_URI += " \ 3SRC_URI += " \
4 file://0001-qmltestexample-fix-link.patch \ 4 file://0001-qmltestexample-fix-link.patch \
5 file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \
6" 5"
7 6
8DEPENDS += "qtbase" 7DEPENDS += "qtbase"
diff --git a/recipes-qt/qt5/qtdeclarative_5.2.1.bb b/recipes-qt/qt5/qtdeclarative_5.2.1.bb
index 8e435cf6..eaa90bac 100644
--- a/recipes-qt/qt5/qtdeclarative_5.2.1.bb
+++ b/recipes-qt/qt5/qtdeclarative_5.2.1.bb
@@ -1,5 +1,9 @@
1require qt5-${PV}.inc 1require qt5-${PV}.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRC_URI += " \
5 file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \
6"
7
4SRC_URI[md5sum] = "a23fba03a4b48f36fe8b51d326d08acc" 8SRC_URI[md5sum] = "a23fba03a4b48f36fe8b51d326d08acc"
5SRC_URI[sha256sum] = "7e32b8d6e1d64ca4bdfa92d15f9b4217a1b24239ef40e8826eeccbe918866690" 9SRC_URI[sha256sum] = "7e32b8d6e1d64ca4bdfa92d15f9b4217a1b24239ef40e8826eeccbe918866690"