29 files changed, 26 insertions, 5 deletions

diff --git a/recipes-qt/qt5-addons/qtcharts_git.bb b/recipes-qt/qt5-addons/qtcharts_git.bb
index 5e95d14..090276b 100644
--- a/recipes-qt/qt5-addons/qtcharts_git.bb
+++ b/recipes-qt/qt5-addons/qtcharts_git.bb
@@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3
 inherit qt5-module qtquickcompiler
 require recipes-qt/qt5/qt5-git.inc
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "f4ba2fb9840279f986bd11ab6860e6a3125d9599"
 
 DEPENDS = "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/qt5-addons/qtdatavis3d_git.bb b/recipes-qt/qt5-addons/qtdatavis3d_git.bb
index 155c8f0..a148bdc 100644
--- a/recipes-qt/qt5-addons/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5-addons/qtdatavis3d_git.bb
@@ -26,7 +26,6 @@ LIC_FILES_CHKSUM = "file://src/datavisualization/global/qdatavisualizationglobal
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
-QT_MODULE_BRANCH = "5.6"
 SRCREV = "4f23f0f984ef2ee96d5baa3a74a465d6734381ba"
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
index 38de1a5..5162519 100644
--- a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
+++ b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
@@ -26,7 +26,6 @@ LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer.
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
-QT_MODULE_BRANCH = "5.6"
 SRCREV = "3a22766e8c4ea39836f197552e92b3cc78e77f62"
 
 DEPENDS = "qtbase qtdeclarative"
diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb
index 5639d60..f4bdbcc 100644
--- a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb
@@ -26,7 +26,6 @@ LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e
 inherit qt5-module qtquickcompiler
 require recipes-qt/qt5/qt5-git.inc
 
-QT_MODULE_BRANCH = "5.6"
 SRCREV = "4d480f8f0c1ca3308f4c3a423ad30d5d44e9c1bf"
 
 DEPENDS = "qtbase qtdeclarative qtsvg hunspell"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index 322e8ac..29adb9b 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "38944d662eda76ecc57cb1fd61da42775fa52f6f"
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend
index 079ddd5..e3fb951 100644
--- a/recipes-qt/qt5/qt3d_git.bbappend
+++ b/recipes-qt/qt5/qt3d_git.bbappend
@@ -25,4 +25,5 @@ SRC_URI_append_class-target = " \
     file://0001-Remove-qgltf.patch \
     "
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "190795b1f884620ba8b31d3998ac97107d4f4eb7"
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend
index 322e8ac..29adb9b 100644
--- a/recipes-qt/qt5/qtbase-native_git.bbappend
+++ b/recipes-qt/qt5/qtbase-native_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "38944d662eda76ecc57cb1fd61da42775fa52f6f"
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index 17ec54a..b8053a8 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -44,8 +44,8 @@ do_configure_prepend() {
     install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
 }
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "38944d662eda76ecc57cb1fd61da42775fa52f6f"
 
 # Temporarily here, until merged upstream
 PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
-PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend
index 0a8d678..9478428 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bbappend
+++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend
index 6841ebe..f9e92da 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bbappend
+++ b/recipes-qt/qt5/qtconnectivity_git.bbappend
@@ -21,4 +21,5 @@
 
 PACKAGECONFIG += "bluez4"
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "8b550f0a7508ed413cded71a20485e61010b0aa3"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend
index 804c736..626014a 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bbappend
+++ b/recipes-qt/qt5/qtdeclarative_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "dc558b69f083c89aa8c02952e5f167405939a61a"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
index d5da008..7f854d5 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "4b8e9a348ca379b203c26ff14dd236267dd60646"
diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend
index 4213bc9..f3895a6 100644
--- a/recipes-qt/qt5/qtimageformats_git.bbappend
+++ b/recipes-qt/qt5/qtimageformats_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "0bd46d5861fa7b48c87cd3a734d00671df929869"
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend
index a012288..db88645 100644
--- a/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/recipes-qt/qt5/qtlocation_git.bbappend
@@ -24,4 +24,5 @@ PACKAGECONFIG += "gypsy"
 EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
 DEPENDS_emulator += "qtsimulator"
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "526f459330d9bb5238479523f45aaa4caa958f77"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend
index ca77e8c..1793fdd 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bbappend
+++ b/recipes-qt/qt5/qtmultimedia_git.bbappend
@@ -21,4 +21,5 @@
 
 PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}"
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "9985224a89b830dc182b428f491b6187d6f0e1ba"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend
index 7d64fdc..c7df857 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bbappend
+++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "85c2d2cce4c7d49bc425ccd0be2bbd9841b7e79b"
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend
index c9c89ed..d570ec2 100644
--- a/recipes-qt/qt5/qtsensors_git.bbappend
+++ b/recipes-qt/qt5/qtsensors_git.bbappend
@@ -22,4 +22,5 @@
 EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator"
 DEPENDS_emulator += "qtsimulator"
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "7197e7f4b385315cb241043495cbfad58deb911a"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 647c582..bc4368f 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -31,4 +31,5 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtserialport"
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "eded6c6c20075628d526541dae94356d3d51965d"
diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend
index e0b0c7e..7e72190 100644
--- a/recipes-qt/qt5/qtserialport_git.bbappend
+++ b/recipes-qt/qt5/qtserialport_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "03d492e49e74eefa1c83e37e833d862f4b9f1e45"
diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend
index 56a80d9..27ed9e2 100644
--- a/recipes-qt/qt5/qtsvg_git.bbappend
+++ b/recipes-qt/qt5/qtsvg_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "38777ea7451d55e9c3d32d88d46063016013f60c"
diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend
index 4200c4d..7244baf 100644
--- a/recipes-qt/qt5/qttools_git.bbappend
+++ b/recipes-qt/qt5/qttools_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "9904992dc4eb9a5958fcfbac238374ff38498143"
diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend
index 5045c67..9c5261a 100644
--- a/recipes-qt/qt5/qttranslations_git.bbappend
+++ b/recipes-qt/qt5/qttranslations_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend
index cd4d339..ffec41e 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bbappend
+++ b/recipes-qt/qt5/qtwayland-native_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "baec8be7294a176620253dbbc1b2938cf96c8360"
diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend
index cd4d339..ffec41e 100644
--- a/recipes-qt/qt5/qtwayland_git.bbappend
+++ b/recipes-qt/qt5/qtwayland_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "baec8be7294a176620253dbbc1b2938cf96c8360"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend
index ac958c0..2179f58 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bbappend
+++ b/recipes-qt/qt5/qtwebchannel_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "92d903d92b430222cd3f89eab08d61d947e5abea"
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend
index f2955d6..59d77b2 100644
--- a/recipes-qt/qt5/qtwebengine_git.bbappend
+++ b/recipes-qt/qt5/qtwebengine_git.bbappend
@@ -25,5 +25,6 @@ SRC_URI_append_mx6 = " \
     file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \
     "
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV_qtwebengine = "ae99405b472babf07b21040444efbdee55a387e9"
 SRCREV_chromium = "e63eb5276c8d141853e2c26bf1bac469ed60465f"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend
index 528e5b6..ea08e2e 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bbappend
+++ b/recipes-qt/qt5/qtwebsockets_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "88946bbe209cb6148b4a3284077bb9a06c7bc1ef"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
index 287ed42..f45b633 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "de2dadb8af67f9d425c3a8d2353a7d5b07588915"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 7299efa..bb9d27b 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -25,7 +25,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="ddbe177dae46353f08f7326a11d3b3fd5a1f8435"
+           revision="60c8b35f13f0969a2244e5ab06333fc3994ed221"
            path="sources/meta-qt5"/>
 
   <project name="meta-mingw"