qt5: update to latest revision in 5.11 branch

* drop nobranch=1 again
* update the branches and tags on meta-qt5/qt* forks and the tag name
  in recipes
* use latest revision in 5.11 branch instead of 5.11.2 which might be
  removed again

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

1 files changed, 5 insertions, 5 deletions

diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index da06514b..caa2d6ab 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared
-# 5.11.meta-qt5-shared.7
+# 5.11.meta-qt5-shared.8
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -38,14 +38,14 @@ SRC_URI += "\
     file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
     file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
     file://0013-Upgrade-double-conversion-to-v3.0.0.patch \
-    file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \
+    file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \
 "
 
 # common for qtbase-native and nativesdk-qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native
-# 5.11.meta-qt5-native.7
+# 5.11.meta-qt5-native.8
 SRC_URI += " \
-    file://0016-Always-build-uic-and-qvkgen.patch \
+    file://0015-Always-build-uic-and-qvkgen.patch \
 "
 
 # CMake's toolchain configuration of nativesdk-qtbase
@@ -192,4 +192,4 @@ fakeroot do_generate_qt_environment_file() {
 do_generate_qt_environment_file[umask] = "022"
 addtask generate_qt_environment_file after do_install before do_package
 
-SRCREV = "b0dce506cc91c4b623eb323db7bbc18469e721c2"
+SRCREV = "49efea26a5fae8c2275999c36c7c8d24cf4125de"