14 files changed, 2 insertions, 137 deletions

diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend
index 952c0c2..95ffc05 100644
--- a/recipes-qt/qt5/qt3d_git.bbappend
+++ b/recipes-qt/qt5/qt3d_git.bbappend
@@ -29,12 +29,6 @@
 
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LICENSE.GPL;md5=c96076271561b0e3785dad260634eaa8 \
-"
-
 SRC_URI_append_class-target = " \
     file://0001-Remove-qgltf.patch \
     "
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index 4939cd9..615cdc6 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -55,5 +55,3 @@ do_configure_prepend() {
 
 SRCREV = "6feec9da93032d11a768802ac2187d9d4153b1ec"
 
-# Temporarily here, until merged upstream
-PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend
index f3c0fa2..8c18714 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bbappend
+++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend
@@ -27,10 +27,4 @@
 ##
 ############################################################################
 
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
-"
-
 SRCREV = "8e34d6f5399a29d45f9402219f13b631e29fd4b0"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
index ff9899b..8cc0676 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
@@ -27,17 +27,4 @@
 ##
 ############################################################################
 
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
 SRCREV = "f536e36e3188903404fac78064ea7872dd8cc0d2"
diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend
index 938a049..14d86cb 100644
--- a/recipes-qt/qt5/qtimageformats_git.bbappend
+++ b/recipes-qt/qt5/qtimageformats_git.bbappend
@@ -27,17 +27,4 @@
 ##
 ############################################################################
 
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
 SRCREV = "11300c62aa021ef07f3e4de8bd875bfcbcbe2f7e"
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend
index f67d2c8..e36ab3e 100644
--- a/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/recipes-qt/qt5/qtlocation_git.bbappend
@@ -27,15 +27,6 @@
 ##
 ############################################################################
 
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
-"
-
 PACKAGECONFIG += "gypsy"
 
 EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend
index cd0c9cc..aa8c29c 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bbappend
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bbappend
@@ -27,10 +27,4 @@
 ##
 ############################################################################
 
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-    file://LICENSE.LGPLv3;md5=a37e6cd7102174853307e03e6edc5f30 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-"
-
 SRCREV = "88969bdbd66b0829fe5e5b90eeb605c663d1b887"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend
index f253ea4..d3ece15 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bbappend
+++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend
@@ -27,15 +27,4 @@
 ##
 ############################################################################
 
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
 SRCREV = "84b3cf1c0483af7ad200ab33944d8eaa4d4ffa48"
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend
index f48150b..df982d8 100644
--- a/recipes-qt/qt5/qtsensors_git.bbappend
+++ b/recipes-qt/qt5/qtsensors_git.bbappend
@@ -27,15 +27,6 @@
 ##
 ############################################################################
 
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
-"
-
 EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator"
 DEPENDS_emulator += "qtsimulator"
 
diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend
index 0150056..131ff1c 100644
--- a/recipes-qt/qt5/qtserialport_git.bbappend
+++ b/recipes-qt/qt5/qtserialport_git.bbappend
@@ -27,13 +27,4 @@
 ##
 ############################################################################
 
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \
-    file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \
-    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
-"
-
 SRCREV = "dee818e77a6cf9a6c164fbc7ee132fe875f7f998"
diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend
index 975e634..d9ebe0b 100644
--- a/recipes-qt/qt5/qtsvg_git.bbappend
+++ b/recipes-qt/qt5/qtsvg_git.bbappend
@@ -29,10 +29,3 @@
 
 SRCREV = "d3d3db5a75fe2ba992742e418bfefa25eddf7684"
 
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
index 5d6f4f2..379dd10 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
@@ -31,46 +31,8 @@ inherit qtquickcompiler
 
 SRCREV = "5ac6b611b196c66bc8b01c23aa50d175ae7a7308"
 
-# To enabled Nuance T9 Write support, you need to provide the licensed components
-# and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file.
-# for example:
-#T9WRITEPACKAGE = "${HOME}/Downloads/zzEval_QT_T9Write_Alpha_v750_20150916.zip"
-#SRC_URI += "file://${T9WRITEPACKAGE};subdir=git/src/virtualkeyboard/3rdparty/t9write"
-#PACKAGECONFIG = "t9write lang-all"
-
 PACKAGECONFIG ?= "lipi-toolkit lang-all hunspell"
-PACKAGECONFIG[hunspell] = ",CONFIG+=disable-hunspell,hunspell"
-PACKAGECONFIG[t9write] = "CONFIG+=t9write"
-PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit"
-PACKAGECONFIG[lang-all] = "CONFIG+=lang-all"
-PACKAGECONFIG[lang-ar_AR] = "CONFIG+=lang-ar_AR"
-PACKAGECONFIG[lang-da_DK] = "CONFIG+=lang-da_DK"
-PACKAGECONFIG[lang-de_DE] = "CONFIG+=lang-de_DE"
-PACKAGECONFIG[lang-en_GB] = "CONFIG+=lang-en_GB"
-PACKAGECONFIG[lang-es_ES] = "CONFIG+=lang-es_ES"
-PACKAGECONFIG[lang-fa_FA] = "CONFIG+=lang-fa_FA"
-PACKAGECONFIG[lang-fi_FI] = "CONFIG+=lang-fi_FI"
-PACKAGECONFIG[lang-fr_FR] = "CONFIG+=lang-fr_FR"
-PACKAGECONFIG[lang-hi_IN] = "CONFIG+=lang-hi_IN"
-PACKAGECONFIG[lang-it_IT] = "CONFIG+=lang-it_IT"
-PACKAGECONFIG[lang-ja_JP] = "CONFIG+=lang-ja_JP"
-PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR"
-PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO"
-PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL"
-PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT"
-PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU"
-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 += "${PACKAGECONFIG_CONFARGS}"
-EXTRA_QMAKEVARS_PRE += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'CONFIG+=disable-desktop', d)}"
-
-PACKAGES += "${PN}-dictionaries"
-RRECOMMENDS_${PN} += "${PN}-dictionaries"
-FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat"
 
-FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
 FILES_${PN}-dbg += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit/lib/.debug"
 INSANE_SKIP_${PN} += "libdir"
 INSANE_SKIP_${PN}-dbg += "libdir"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend
index 77bf91d..69443dd 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bbappend
+++ b/recipes-qt/qt5/qtwebsockets_git.bbappend
@@ -27,11 +27,4 @@
 ##
 ############################################################################
 
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \
-"
-
 SRCREV = "60cede232aca96f3f6852c54c0d97cf1771fb371"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 89a97f7..ad454d1 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -11,6 +11,7 @@
   <remote fetch="git://github.com/architech-boards" name="architech"/>
   <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
   <remote fetch="git://code.qt.io/yocto" name="qtyocto"/>
+  <remote fetch="ssh://codereview.qt-project.org/yocto" name="gerrit"/>
   <remote fetch="git://git.yoctoproject.org" name="intel"/>
   <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
   <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/>
@@ -25,7 +26,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="c82a99ecbeff88ff8a1f6eaa272a352e97992ab1"
+           revision="9955f170ad32bc8d6915d1dc2b6b19a8181a6363"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"