summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2018-01-19 10:11:38 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2018-01-26 11:04:58 +0000
commitc32de2f746d944f515e9e47dd330dfb64b3ca280 (patch)
treee02d704af785be1c81916864b95b2836ea89e190
parentbc0625e7a03f9f04fdae3a89137812a216e977cd (diff)
downloadmeta-qt5-c32de2f746d944f515e9e47dd330dfb64b3ca280.tar.gz
qt5: update submodules
- Update Qt submodules to 5.10.1 snapshot - Some cleanup for licenses Task-number: QTBUG-65164 Change-Id: I4a3fcbd441a222250c774e194632fa57285c13aa Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb11
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb12
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qtsystems_git.bb11
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb4
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb6
35 files changed, 51 insertions, 53 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 9b728c47..97a70c09 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -202,4 +202,4 @@ fakeroot do_generate_qt_environment_file() {
202 202
203addtask generate_qt_environment_file after do_install before do_package 203addtask generate_qt_environment_file after do_install before do_package
204 204
205SRCREV = "24fba6744cea1163ceee06d69d31b4eb619cd386" 205SRCREV = "41cdfbe3a473a4f691c193a58206d860cb9c676d"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 6506db86..e0822fb6 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -37,6 +37,6 @@ do_configure_prepend() {
37 ${S}/src/quick3d/imports/input/importsinput.pro 37 ${S}/src/quick3d/imports/input/importsinput.pro
38} 38}
39 39
40SRCREV = "1d5f8b8536c1b0165c2292529dc3814e96bb0a27" 40SRCREV = "6b662b93048ee29d6684010cee7e59e9c4248bd1"
41 41
42BBCLASSEXTEND += "native nativesdk" 42BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 8101e6ea..1787312a 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -131,4 +131,4 @@ do_install() {
131 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 131 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
132} 132}
133 133
134SRCREV = "24fba6744cea1163ceee06d69d31b4eb619cd386" 134SRCREV = "41cdfbe3a473a4f691c193a58206d860cb9c676d"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index aa89280b..86cd7ff2 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -248,4 +248,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
248 248
249RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 249RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
250 250
251SRCREV = "24fba6744cea1163ceee06d69d31b4eb619cd386" 251SRCREV = "41cdfbe3a473a4f691c193a58206d860cb9c676d"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index 40b735b2..13d75669 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS = "qtdeclarative" 11DEPENDS = "qtdeclarative"
12 12
13SRCREV = "4cea1fdf84a7618d8d815189881368bb47926486" 13SRCREV = "b742b8f1b654bd185244973f7bae60da951d41a4"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index a74dc069..3afd33ea 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "2d962cffd5d6d5b1c40bef8807a2a774cc6fb637" 11SRCREV = "175d864fbb96ed64cc609fe08df4b28668368040"
12 12
13# The same issue as in qtbase: 13# The same issue as in qtbase:
14# http://errors.yoctoproject.org/Errors/Details/152641/ 14# http://errors.yoctoproject.org/Errors/Details/152641/
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 493f0799..681fd05c 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
19 19
20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
21 21
22SRCREV = "e8d9bd63b05b33b22ff5d19fb31ad55b1e409256" 22SRCREV = "b274a83bf4f44d0e2642a8e3bd6bada4ccdbf83c"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 45f840cd..249f8f06 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" 9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
10 10
11SRCREV = "7dd95d1d4cb65662a9bbb739163b7e12f3d81a84" 11SRCREV = "63b90a1d334743b63f396331434e9b12e366f9d3"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 1a8ee4c3..222cccc4 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -30,6 +30,6 @@ do_install_append_class-nativesdk() {
30 30
31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
32 32
33SRCREV = "2eb2d6386da304cd1164264ae0bff685c796d89c" 33SRCREV = "1b96186d1418adcba85fdbfd794da2d2f6ea122d"
34 34
35BBCLASSEXTEND =+ "native nativesdk" 35BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index 7769b0b6..dcb4d115 100644
--- a/recipes-qt/qt5/qtgamepad_git.bb
+++ b/recipes-qt/qt5/qtgamepad_git.bb
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
14 14
15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
16 16
17SRCREV = "ad15ca27280e23dbb07e5622f40cdd85479715df" 17SRCREV = "544d3e4f6f42771b38cafd8a200b16299f2d102c"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index cacfc44a..c58cc7af 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
18# http://errors.yoctoproject.org/Errors/Build/44912/ 18# http://errors.yoctoproject.org/Errors/Build/44912/
19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
20 20
21SRCREV = "eff278540f723f2db3b98caf7fa3af551c61da3a" 21SRCREV = "66031e932c321ccb936e254b5d1810fa633c6cb0"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 381ab9fb..41eb8c73 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
26 26
27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
28 28
29SRCREV = "c34ab1c43a3cbbaad127eb8bc6fd9b5c90a1169f" 29SRCREV = "54cdb5b07b2ae2130ce73c6bb22c65b4ad1cba03"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index b19a0b65..08655994 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -1,14 +1,15 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0 | The-Qt-Company-Commercial" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
9 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ 10 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
12" 13"
13 14
14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" 15DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
@@ -29,7 +30,7 @@ SRC_URI += " \
29 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 30 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
30" 31"
31 32
32SRCREV_qtlocation = "eca7ffd4f8539292aed40b81284e0cd81f80c998" 33SRCREV_qtlocation = "9283a290040fd55f7eb34580b99f771d4facdeb4"
33SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7" 34SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7"
34 35
35SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 36SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index a805b9f1..c489b151 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -35,4 +35,4 @@ SRC_URI += "\
35# http://errors.yoctoproject.org/Errors/Build/44914/ 35# http://errors.yoctoproject.org/Errors/Build/44914/
36LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 36LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
37 37
38SRCREV = "7a3b8907060123fe5d487d4c9ba3a1e222f468bb" 38SRCREV = "a3fb242676055355deb68788199ae59abe58ca41"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index 4bdaa8e6..0180376e 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "f6aedc74c4a95440e649b625b6272f29e7f5fa71" 12SRCREV = "8f4f2e0cae642ff5eb0b87ae1d4e9c5e6ccf2bd8"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 2fb2d935..af998732 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtdeclarative" 11DEPENDS += "qtdeclarative"
12 12
13SRCREV = "d26d6a46bb5793e4a3bdc2c7a387f8f8a89b349b" 13SRCREV = "b500fbfb5b24f24f6cb3cb02981726fb858287ce"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 096b2d29..534869b3 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -20,4 +20,4 @@ FILES_${PN}-qmlplugins += " \
20 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ 20 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
21" 21"
22 22
23SRCREV = "314d1bdf7d56462102639e12d34596cbfd4fce95" 23SRCREV = "698a8268f786d74726eb07255df2d26ac2269079"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index 062dc898..91764053 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
24 24
25EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 25EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
26 26
27SRCREV = "6eb36c47776e5f4c300f43fd191429af0664b3e5" 27SRCREV = "c26dd694e8374b478bf428bc9e8753cfc0c3a523"
28 28
29BBCLASSEXTEND += "native nativesdk" 29BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index f24d1cd2..a0ab305d 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -30,4 +30,4 @@ DEPENDS += "qtbase"
30# http://errors.yoctoproject.org/Errors/Build/44915/ 30# http://errors.yoctoproject.org/Errors/Build/44915/
31LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 31LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
32 32
33SRCREV = "930a0cd94d06ea7278fc9aa58b637f862a8de357" 33SRCREV = "84b13fd9fcd85d39411150f8ae46916a048c413c"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 07d6b739..c460c92a 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "e5b1a29882b8609fc41fd5af56495a408b747a80" 13SRCREV = "be2cb77f0c882444d4d1080953b4d1b961973c0a"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9
16# 5.9.meta-qt5.2 16# 5.9.meta-qt5.2
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index abd0ec73..a3725483 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase qtdeclarative" 13DEPENDS += "qtbase qtdeclarative"
14 14
15SRCREV = "b6c120bd507b6adc7a5f02b089b5187308d80bb3" 15SRCREV = "a5881f10e0ba6ba283b1215a5342056196661414"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 22e27be6..427d5964 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
13 13
14SRCREV = "5b2d55c0f57c525e58bfe2c4afa80dc012920a14" 14SRCREV = "b65de45fbfa08d0d2d5b89df77181d3726598097"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 11f8fd02..d988feec 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -3,16 +3,16 @@ require qt5-git.inc
3 3
4# text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what 4# text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what
5# other qt* components use :/ 5# other qt* components use :/
6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | The-Qt-Company-Commercial" 6LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
7LIC_FILES_CHKSUM = " \ 7LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ 8 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
9 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ 9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ 10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
11 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ 12 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \
12 file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \ 13 file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \
13 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
14" 14"
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "00f3e2df573400c7ee350bc2b2c5e89e50ab27ca" 18SRCREV = "7c827dcbf82d5e5bfbba4053a32c54413a95182a"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 093e97b3..e06940ac 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "2e719713be8ac3b1e26b23221f12db136d9d5103" 16SRCREV = "275bd8a4a76256e889cad1ea88c4b5d3acb9ad8f"
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index bc3e289f..0bda2e99 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -1,12 +1,13 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=4193e7f1d47a858f6b7c0f1ee66161de \
7 file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
8 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
9 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 6 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
7 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
8 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
10 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
10" 11"
11 12
12DEPENDS += "qtbase qtdeclarative udev gconf" 13DEPENDS += "qtbase qtdeclarative udev gconf"
@@ -30,4 +31,4 @@ do_install_append() {
30 31
31QT_MODULE_BRANCH = "dev" 32QT_MODULE_BRANCH = "dev"
32 33
33SRCREV = "ca54870ffdf262f072c082adf80d63c421dbd68f" 34SRCREV = "66e45676f5f5c6251ccab36906c6324fd0065e08"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 40adf821..cca02b03 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -31,7 +31,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
31 31
32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
33 33
34SRCREV = "1f3bf9c015aeb4cc017980a2bf75724cd7b1049f" 34SRCREV = "3c7675d9609a15bea81884560920bded736f79a6"
35 35
36BBCLASSEXTEND = "native nativesdk" 36BBCLASSEXTEND = "native nativesdk"
37 37
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 4b0b6aa4..95357374 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -111,4 +111,4 @@ FILES_${PN}-qt = " \
111 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ 111 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
112" 112"
113 113
114SRCREV = "f54b179a16a2301bac828a97a86b1a3719619d17" 114SRCREV = "c3486e072ebc704f9c82c005044143b07bb88f12"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 828a7a04..5952c8ec 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -53,4 +53,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
53 53
54DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 54DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
55 55
56SRCREV = "477fa0d4b5c27b649e15c8819bf8a95e7a8922c1" 56SRCREV = "1a9158bfbdd8dd01bac591c11bb0d0bf46514ddb"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 4072560f..46ae8378 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature
37 37
38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
39 39
40SRCREV = "8bd8815fd629e34c54924a2ada41007464da22ec" 40SRCREV = "06230d22488796d92ea130e985d1e0ee2ed05199"
41 41
42# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 42# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9
43# 5.9.meta-qt5.2 43# 5.9.meta-qt5.2
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 1ed7008b..ce51cbc0 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtdeclarative qtwebsockets" 13DEPENDS += "qtdeclarative qtwebsockets"
14 14
15SRCREV = "5a9dd81f260f320b5af108c1a6b3d0b82a04f15d" 15SRCREV = "a2b88f9ba0ce2e03ffa73ba26e910e988db5d6c1"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 214b9ac3..c0c52eb1 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -156,8 +156,8 @@ SRC_URI_append_libc-musl = "\
156 file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ 156 file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
157" 157"
158 158
159SRCREV_qtwebengine = "6666e23ed6252c3ef53c5f17d4f28bfe63736e33" 159SRCREV_qtwebengine = "14b58276822c12e8d21580f61869b5a9bbf43f22"
160SRCREV_chromium = "5971c2e5153a73062e87ccf961166611385ac7a4" 160SRCREV_chromium = "f0775ea93ab66f0676993db1633c9098dfb3a3ad"
161SRCREV = "${SRCREV_qtwebengine}" 161SRCREV = "${SRCREV_qtwebengine}"
162 162
163SRCREV_FORMAT = "qtwebengine_chromium" 163SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 25bf2bec..91660c62 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "91bb3576f7787041ab85d0ff6c0dfe2ce26281b9" 14SRCREV = "f8665a7cf5e18e5e40ad3e50039ba0362c5d2ec7"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index e6a803eb..b666548d 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
19COMPATIBLE_MACHINE_armv7ve = "(.*)" 19COMPATIBLE_MACHINE_armv7ve = "(.*)"
20COMPATIBLE_MACHINE_aarch64 = "(.*)" 20COMPATIBLE_MACHINE_aarch64 = "(.*)"
21 21
22SRCREV = "4cefce7644f1eb9b9a5750ebc1b361976d866448" 22SRCREV = "eef3467cfad9f6ad892344bfcadbd59b5bcb4f53"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 03702e90..a1e0c1a1 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "c12cc26b7d64aef12f6f1ccedf3273f23799e920" 16SRCREV = "fcd1d9a09d22619dfae4c1d4f9911e9acce2e893"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index efd8e216..226b00a7 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -6,19 +6,15 @@ HOMEPAGE = "http://www.qt.io"
6LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 6LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
7LIC_FILES_CHKSUM = " \ 7LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 8 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
9 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
10 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
11 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
12 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
13 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
14 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
15 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
16 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
17" 13"
18 14
19DEPENDS += "qtbase" 15DEPENDS += "qtbase"
20 16
21SRCREV = "75e9858a87307f61b478735f73c0a60c52c25eb8" 17SRCREV = "0a84ad44ff5b793316485fd992326627a70fda84"
22 18
23BBCLASSEXTEND =+ "native nativesdk" 19BBCLASSEXTEND =+ "native nativesdk"
24 20