qt5: update submodules and use latest version of meta-qt5

Change-Id: Idc2f9a08d6dcbd59dc742e55e2916976b38b3a13
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

25 files changed, 26 insertions, 42 deletions

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 6f5d6da..e657c87 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -57,7 +57,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio sysvinit"
 FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache"
 
 # backport from oe/krogoth, needed by meta-qt5
-EXTRA_CONF_PACKAGECONFIG = "${EXTRA_OECONF}"
+PACKAGECONFIG_CONFARGS = "${EXTRA_OECONF}"
 
 # use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10
 DISTRO_FEATURES += "gstreamer"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index a5d33c7..0ecbdb7 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -27,7 +27,7 @@
 ##
 ############################################################################
 
-SRCREV = "c327fb79e1a50c825a945e97f2c66d07a1c6d225"
+SRCREV = "e64b2234e829cc47872225debcf80d6c06db18f0"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
 
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend
index a03247d..309a303 100644
--- a/recipes-qt/qt5/qt3d_git.bbappend
+++ b/recipes-qt/qt5/qt3d_git.bbappend
@@ -33,4 +33,4 @@ SRC_URI_append_class-target = " \
     file://0001-Remove-qgltf.patch \
     "
 
-SRCREV = "fae5232d47844c49dc237757e874b1b261240cfe"
+SRCREV = "268a77db1f25aef6dc6e2642410942b2b4135680"
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend
index 4881e9f..e1009a2 100644
--- a/recipes-qt/qt5/qtbase-native_git.bbappend
+++ b/recipes-qt/qt5/qtbase-native_git.bbappend
@@ -27,7 +27,7 @@
 ##
 ############################################################################
 
-SRCREV = "c327fb79e1a50c825a945e97f2c66d07a1c6d225"
+SRCREV = "e64b2234e829cc47872225debcf80d6c06db18f0"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
 
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index 074a352..b1eb40a 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -53,7 +53,7 @@ do_configure_prepend() {
     install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
 }
 
-SRCREV = "c327fb79e1a50c825a945e97f2c66d07a1c6d225"
+SRCREV = "c5c7997fc22cf914f72179d813ad6a41506e0293"
 
 # Temporarily here, until merged upstream
 PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 8c0c6a8..cfbf87a 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -34,6 +34,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 inherit qt5-module qtquickcompiler
 require recipes-qt/qt5/qt5-git.inc
 
-SRCREV = "97bb01ce5d85ac94ed019f0abd7a08917ae4f80a"
+SRCREV = "7bc9c012efbb987790742ee8905965344be55ea7"
 
 DEPENDS = "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend
index 65d29c4..0a77b5b 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bbappend
+++ b/recipes-qt/qt5/qtconnectivity_git.bbappend
@@ -27,5 +27,5 @@
 ##
 ############################################################################
 
-SRCREV = "f8759f683cfc433c432059e1160d2ab657baaec6"
+SRCREV = "caded2edf69e8a60897653ace1e10b72199c7427"
 
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index e4670cd..647ad40 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -34,6 +34,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
-SRCREV = "8427634773505f73ce030cf68761c4719eb03e5c"
+SRCREV = "2f6074fde0ec050c77f881e0d2ce265fa93a0fcc"
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend
index de2d234..ca44dad 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bbappend
+++ b/recipes-qt/qt5/qtdeclarative_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
 
-SRCREV = "70cb68298ae36e9c8f669182707ac97f8acb0681"
+SRCREV = "531d00c1909527cb1bc28f17197267ccde408b0c"
diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend
index 1f72d10..346bb01 100644
--- a/recipes-qt/qt5/qtimageformats_git.bbappend
+++ b/recipes-qt/qt5/qtimageformats_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
 
-SRCREV = "42b07b2ddf443d3eafd18e169f2e5ab5e36604a5"
+SRCREV = "68d9cfe5256c91510552c2b16d5efdb01e77ea57"
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend
index 8258f10..0829aa7 100644
--- a/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/recipes-qt/qt5/qtlocation_git.bbappend
@@ -32,4 +32,4 @@ PACKAGECONFIG += "gypsy"
 EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
 DEPENDS_emulator += "qtsimulator"
 
-SRCREV = "bae9a0f52eb4c8faab2315dd45757c49544f682c"
+SRCREV = "761331ddc841809a4bdc6ca2f2b84c148cb9b19a"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend
index 8e1e080..2ca480e 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bbappend
+++ b/recipes-qt/qt5/qtmultimedia_git.bbappend
@@ -29,4 +29,4 @@
 
 PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}"
 
-SRCREV = "7f286e0965eb31f29c68b1c1e32d2653ae34014e"
+SRCREV = "08e13bfcdb23eabfbc47bca7499b0b8aadce0ac7"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bbappend
index 1861dd7..3437494 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bbappend
@@ -27,20 +27,4 @@
 ##
 ############################################################################
 
-require recipes-qt/qt5/qt5.inc
-require recipes-qt/qt5/qt5-git.inc
-
-LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-3.0)"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv3;md5=8ba7f2099d17d636d5fcc8303bb17587 \
-    file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
-DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtgraphicaleffects"
-
-SRCREV = "4ae3a828ad972e24802ea711fc12e12883cc28be"
-
-FILES_${PN}-qmldesigner += " \
-    ${OE_QMAKE_PATH_QML}/*/*/*/designer \
-"
+SRCREV = "c256d154520123232c7dd3e2e3557a60833406f3"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend
index 34aebe3..bb9745b 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bbappend
+++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
 
-SRCREV = "4b77b044b3e0a27f9f7501e6a78121afc270619c"
+SRCREV = "c6713e212ef0b97c45d6466b73220567e94a05f1"
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend
index c2d2042..4718a26 100644
--- a/recipes-qt/qt5/qtsensors_git.bbappend
+++ b/recipes-qt/qt5/qtsensors_git.bbappend
@@ -30,4 +30,4 @@
 EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator"
 DEPENDS_emulator += "qtsimulator"
 
-SRCREV = "33d15b76dfdb95da5970b8e0294bbb87ea1eb9a8"
+SRCREV = "f32489e379805c51b28ae5d471491a649283fd8d"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 1cf3527..23f6e81 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -39,4 +39,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtserialport"
 
-SRCREV = "1675a0d726e5c07c275c0981cc3deb5ffbcc6afc"
+SRCREV = "ad54496cce03077073660c5c440b0f45b7e46496"
diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend
index 2cb5acf..dd5555f 100644
--- a/recipes-qt/qt5/qtserialport_git.bbappend
+++ b/recipes-qt/qt5/qtserialport_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
 
-SRCREV = "84feab670cce8414ad54f4d19b46291c7fdb14cf"
+SRCREV = "a11fa1dfd529948da961d3d292926a15f9b7005b"
diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend
index 6273ddd..62b0cd8 100644
--- a/recipes-qt/qt5/qttools_git.bbappend
+++ b/recipes-qt/qt5/qttools_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
 
-SRCREV = "d36d2c3026cae67c119384f47cb2680552c81aaf"
+SRCREV = "570f0f314cbe4603db34d4967b6a7dd35d174eba"
diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend
index 472b99c..88ed353 100644
--- a/recipes-qt/qt5/qttranslations_git.bbappend
+++ b/recipes-qt/qt5/qttranslations_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
 
-SRCREV = "745f8d5329d0d6d98a8577a254d2ee3e7174634e"
+SRCREV = "c95337f7e974c75a88b96c168b6056a1642399bb"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 67dced4..f950fb4 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -62,7 +62,7 @@ PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE"
 PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN"
 PACKAGECONFIG[lang-zh_TW] = "CONFIG+=lang-zh_TW"
 
-EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}"
+EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 EXTRA_QMAKEVARS_PRE += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'CONFIG+=disable-desktop', d)}"
 
 PACKAGES += "${PN}-dictionaries"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend
index 63ace55..0475d55 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bbappend
+++ b/recipes-qt/qt5/qtwayland-native_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
 
-SRCREV = "15216555593740029f3c25ee16dc4dc248a017b7"
+SRCREV = "c7832b0a1d4e5e095e56315c43145bb8964f7030"
diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend
index 63ace55..0475d55 100644
--- a/recipes-qt/qt5/qtwayland_git.bbappend
+++ b/recipes-qt/qt5/qtwayland_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
 
-SRCREV = "15216555593740029f3c25ee16dc4dc248a017b7"
+SRCREV = "c7832b0a1d4e5e095e56315c43145bb8964f7030"
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend
index cc21c25..7ca1113 100644
--- a/recipes-qt/qt5/qtwebengine_git.bbappend
+++ b/recipes-qt/qt5/qtwebengine_git.bbappend
@@ -33,5 +33,5 @@ SRC_URI_append_mx6 = " \
     file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \
     "
 
-SRCREV_qtwebengine = "22a550303618202135e58f5673e7b8935d578687"
-SRCREV_chromium = "349c3122be9f932991f938a33e761b00062a5f5b"
+SRCREV_qtwebengine = "023168cf91dc7ac11ced1b6a60ca7aa248987810"
+SRCREV_chromium = "46f522d613bb77600ed3a85580ff84ee9802e21b"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
index 59ad1f7..d902411 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
 
-SRCREV = "9661c2a29f4bacf77170eb6b3cf016fdb6631f82"
+SRCREV = "9751d3d82eecb4f2c2a805783fbcce9ccd189fea"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 26a1816..3f86164 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -25,7 +25,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="e6897ccd0eec8fb5229e0fdd8f354292e0f49a16"
+           revision="6bd7ab491793d92f0942d9d8726873a514302849"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"