qtbase: move 0015-Fix-linuxfb-argument-mmsize-parsing.patch to 5.2.1 recipe5.2.1+origin/release

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 4 insertions, 3 deletions

diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index a6fb3b22..89736bea 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -18,7 +18,6 @@ SRC_URI += "\
     file://0011-Allow-building-a-separate-qmake-for-the-target.patch \
     file://0013-QOpenGLPaintDevice-sub-area-support.patch \
     file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
-    file://0015-Fix-linuxfb-argument-mmsize-parsing.patch \
     file://0016-eglfs-Fix-quad-coordinates.patch \
 "
 
diff --git a/recipes-qt/qt5/qtbase_5.2.1.bb b/recipes-qt/qt5/qtbase_5.2.1.bb
index c106d227..4257367a 100644
--- a/recipes-qt/qt5/qtbase_5.2.1.bb
+++ b/recipes-qt/qt5/qtbase_5.2.1.bb
@@ -1,5 +1,7 @@
 require qt5-${PV}.inc
 require ${PN}.inc
 
+SRC_URI += "file://0015-Fix-linuxfb-argument-mmsize-parsing.patch"
+
 SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b"
 SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 10839834..07dd936d 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -2,5 +2,5 @@ require qt5-git.inc
 require ${PN}.inc
 
 QT_MODULE_BRANCH = "release"
-# v5.2.1 + 168 commits
-SRCREV = "08cbbde61778276ccdda73d89fd64d02c623779f"
+# v5.2.1 + 172 commits
+SRCREV = "bf0336a02502b3ed4d399c1cf5b4a56b1e858d42"