diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-06 13:56:41 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-09-06 13:56:41 +0000 |
commit | 03283e38485649f210e547042dfa6a341485f613 (patch) | |
tree | 27b8bc7208b1521f2b7cd83bf98939e45f278c0a | |
parent | 2a10f40a40bcfb5ff31397c8a2cac19113208488 (diff) | |
parent | 695e3d5e38f2aa75c39b2a788a768364362aa737 (diff) | |
download | meta-boot2qt-03283e38485649f210e547042dfa6a341485f613.tar.gz |
Merge "Merge remote-tracking branch 'origin/jethro' into dev" into refs/staging/dev
30 files changed, 131 insertions, 44 deletions
diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.14.%.bbappend index ee4b955..fb5280c 100644 --- a/meta-fsl-extras/recipes/linux/linux-boundary_3.14.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.14.%.bbappend | |||
@@ -34,3 +34,7 @@ SRC_URI += " \ | |||
34 | 34 | ||
35 | # kernel image files are not needed in the image | 35 | # kernel image files are not needed in the image |
36 | RDEPENDS_kernel-base = "" | 36 | RDEPENDS_kernel-base = "" |
37 | |||
38 | do_configure_prepend() { | ||
39 | echo "CONFIG_HID_MULTITOUCH=m" >> ${WORKDIR}/defconfig | ||
40 | } | ||
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 143ba8b..10fcb28 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend | |||
@@ -27,7 +27,7 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "5c2ff22ba117f295718c529198ab42ee4646d90c" | 30 | SRCREV = "dbfd7f304c4d91096e104ec2383d92a37502d836" |
31 | 31 | ||
32 | FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" | 32 | FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" |
33 | 33 | ||
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index bcc33d6..5a522af 100644 --- a/recipes-qt/qt5/qt3d_git.bbappend +++ b/recipes-qt/qt5/qt3d_git.bbappend | |||
@@ -29,8 +29,14 @@ | |||
29 | 29 | ||
30 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" | 30 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" |
31 | 31 | ||
32 | LIC_FILES_CHKSUM = " \ | ||
33 | file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \ | ||
34 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
35 | file://LICENSE.GPL;md5=c96076271561b0e3785dad260634eaa8 \ | ||
36 | " | ||
37 | |||
32 | SRC_URI_append_class-target = " \ | 38 | SRC_URI_append_class-target = " \ |
33 | file://0001-Remove-qgltf.patch \ | 39 | file://0001-Remove-qgltf.patch \ |
34 | " | 40 | " |
35 | 41 | ||
36 | SRCREV = "eb3fed53f75abd15203d4c749e4815a74f1fccb2" | 42 | SRCREV = "db3baec236841f9390e9450772838cb7ba878069" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 855bb03..62170bc 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend | |||
@@ -27,7 +27,7 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "6c1e352803a6efbd8b14e5296434e22165b65084" | 30 | SRCREV = "dbfd7f304c4d91096e104ec2383d92a37502d836" |
31 | 31 | ||
32 | FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" | 32 | FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" |
33 | 33 | ||
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 8f0a9e5..8861ba5 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend | |||
@@ -27,7 +27,7 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | PACKAGECONFIG_GL = "gles2" | 30 | PACKAGECONFIG_GL = "gles2 eglfs" |
31 | PACKAGECONFIG += " \ | 31 | PACKAGECONFIG += " \ |
32 | accessibility \ | 32 | accessibility \ |
33 | alsa \ | 33 | alsa \ |
@@ -53,7 +53,7 @@ do_configure_prepend() { | |||
53 | install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs | 53 | install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs |
54 | } | 54 | } |
55 | 55 | ||
56 | SRCREV = "6c1e352803a6efbd8b14e5296434e22165b65084" | 56 | SRCREV = "dbfd7f304c4d91096e104ec2383d92a37502d836" |
57 | 57 | ||
58 | # Temporarily here, until merged upstream | 58 | # Temporarily here, until merged upstream |
59 | PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" | 59 | 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 e87f901..559955f 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bbappend +++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend | |||
@@ -27,4 +27,10 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "5f4845dbaa6f5fc59ffc3b7418f846aefc191c17" | 30 | LIC_FILES_CHKSUM = " \ |
31 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | ||
32 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
33 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ | ||
34 | " | ||
35 | |||
36 | SRCREV = "269b1d5699f6c95d46553e7ee547f1c4b7545e63" | ||
diff --git a/recipes-qt/qt5/qtcharts_git.bbappend b/recipes-qt/qt5/qtcharts_git.bbappend index 482f5c7..3a23c41 100644 --- a/recipes-qt/qt5/qtcharts_git.bbappend +++ b/recipes-qt/qt5/qtcharts_git.bbappend | |||
@@ -29,4 +29,4 @@ | |||
29 | 29 | ||
30 | inherit qtquickcompiler | 30 | inherit qtquickcompiler |
31 | 31 | ||
32 | SRCREV = "0464d42b101eaf60c62be751785009d09065f2cf" | 32 | SRCREV = "c121fb4ad00bc9617a011e040ef5ed695610a504" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index 1439fbc..84d173a 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend | |||
@@ -27,5 +27,5 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "344583c3994048fbc7757c4e2abb647329eadbf3" | 30 | SRCREV = "dc1e5850237660df4c64c5ed29e5f7824be6ce81" |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bbappend b/recipes-qt/qt5/qtdatavis3d_git.bbappend index 1fbf9e4..bb15587 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bbappend +++ b/recipes-qt/qt5/qtdatavis3d_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "643a6ad1872e87a3a54e12cca8b365475f0d1eb3" | 30 | SRCREV = "2523056490c3f7a35d176deb583ba46899fe260b" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 9827013..727e2b0 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "210617de78c78af44efdc251ba7a207c5c26e11c" | 30 | SRCREV = "6839f03051d2950e4721cbb5ee88fa7b07109588" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend index c303d3d..ff9899b 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend | |||
@@ -27,4 +27,17 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "55c13afa512bf5deaf1481917eb5902880a23e32" | 30 | LIC_FILES_CHKSUM = " \ |
31 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | ||
32 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ | ||
33 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | ||
34 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
35 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | ||
36 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | ||
37 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ | ||
38 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
39 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
40 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | ||
41 | " | ||
42 | |||
43 | SRCREV = "f536e36e3188903404fac78064ea7872dd8cc0d2" | ||
diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend index 3678923..9b1fe9e 100644 --- a/recipes-qt/qt5/qtimageformats_git.bbappend +++ b/recipes-qt/qt5/qtimageformats_git.bbappend | |||
@@ -27,4 +27,17 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "627666095ff5d4767cdb6803f677798b0a1aaa31" | 30 | LIC_FILES_CHKSUM = " \ |
31 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | ||
32 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ | ||
33 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | ||
34 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
35 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | ||
36 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | ||
37 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ | ||
38 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
39 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
40 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | ||
41 | " | ||
42 | |||
43 | SRCREV = "167f91bebe2ee53fcd13d843dc9e0aad80b92d82" | ||
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index 3a62808..bb03307 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend | |||
@@ -27,9 +27,18 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | LIC_FILES_CHKSUM = " \ | ||
31 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ | ||
32 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | ||
33 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
34 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
35 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | ||
36 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ | ||
37 | " | ||
38 | |||
30 | PACKAGECONFIG += "gypsy" | 39 | PACKAGECONFIG += "gypsy" |
31 | 40 | ||
32 | EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" | 41 | EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" |
33 | DEPENDS_emulator += "qtsimulator" | 42 | DEPENDS_emulator += "qtsimulator" |
34 | 43 | ||
35 | SRCREV = "f185e71635fda88a69e5edc8e20a4b397fd6f837" | 44 | SRCREV = "19642842cea91a4588828362eba023c5da5ab57b" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index e36be2a..f694f7a 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend | |||
@@ -31,4 +31,4 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d) | |||
31 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ | 31 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ |
32 | ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" | 32 | ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" |
33 | 33 | ||
34 | SRCREV = "8a2c5887cc7af6b0bb2fef913bc2acca5002cbf0" | 34 | SRCREV = "29a46aa4ac38bf9faedbaca6d1c191d38d2db079" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend index 2886e20..9b2122d 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols2_git.bbappend | |||
@@ -27,4 +27,10 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "6b0fc95d094258d968b57f48c03f10be2fe8ac26" | 30 | LIC_FILES_CHKSUM = " \ |
31 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | ||
32 | file://LICENSE.LGPLv3;md5=a37e6cd7102174853307e03e6edc5f30 \ | ||
33 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
34 | " | ||
35 | |||
36 | SRCREV = "b63d182dc2ab737a814bdee06f20907bec9c26eb" | ||
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index 541d8d8..3e22418 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend | |||
@@ -27,4 +27,15 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "b5a8306bf6d4949066872ac2afc8d0a01f716bd7" | 30 | LIC_FILES_CHKSUM = " \ |
31 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | ||
32 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | ||
33 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
34 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | ||
35 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | ||
36 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ | ||
37 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
38 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | ||
39 | " | ||
40 | |||
41 | SRCREV = "22fab1502f562bccb3c16dde0288aa867e3b094a" | ||
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index e7694cb..33fd900 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend | |||
@@ -27,7 +27,16 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | LIC_FILES_CHKSUM = " \ | ||
31 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ | ||
32 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | ||
33 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
34 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
35 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | ||
36 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ | ||
37 | " | ||
38 | |||
30 | EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" | 39 | EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" |
31 | DEPENDS_emulator += "qtsimulator" | 40 | DEPENDS_emulator += "qtsimulator" |
32 | 41 | ||
33 | SRCREV = "ea21a76606259eca44e2b4f7d42c2127950c2987" | 42 | SRCREV = "beac0b2e3ea4b292f0473c00bcf68d75360f89ef" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bbappend index 1f7057c..795422a 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bbappend | |||
@@ -27,16 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | require recipes-qt/qt5/qt5.inc | 30 | SRCREV = "398eda8be9eb3415ca44cc35dad3422311d8e221" |
31 | require recipes-qt/qt5/qt5-git.inc | ||
32 | |||
33 | LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0)" | ||
34 | LIC_FILES_CHKSUM = " \ | ||
35 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | ||
36 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | ||
37 | file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ | ||
38 | " | ||
39 | |||
40 | DEPENDS += "qtbase qtserialport" | ||
41 | |||
42 | SRCREV = "f9201ca7bad9220149fb39b89914e83a4a14dffc" | ||
diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend index 7a41877..a2619f6 100644 --- a/recipes-qt/qt5/qtserialport_git.bbappend +++ b/recipes-qt/qt5/qtserialport_git.bbappend | |||
@@ -27,4 +27,13 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "9b19e9ce6cb3ed753fee3a659534398d730fb629" | 30 | LIC_FILES_CHKSUM = " \ |
31 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ | ||
32 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | ||
33 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
34 | file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ | ||
35 | file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \ | ||
36 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ | ||
37 | " | ||
38 | |||
39 | SRCREV = "10967b1443720116744ecfc42fe442681d149c5a" | ||
diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend index 7718efb..84be9fd 100644 --- a/recipes-qt/qt5/qtsvg_git.bbappend +++ b/recipes-qt/qt5/qtsvg_git.bbappend | |||
@@ -27,6 +27,12 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "d39db072e40263314f505cdaa10e17f7358b9392" | 30 | SRCREV = "55825068ab0e3102bf5f8843c0cccab1ff120ae1" |
31 | 31 | ||
32 | SRC_URI_remove = "file://0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch" | 32 | LIC_FILES_CHKSUM = " \ |
33 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ | ||
34 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | ||
35 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
36 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
37 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | ||
38 | " | ||
diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index 2f9a759..c46a1a7 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "4c1d5c04162752fc6aea40e80a8b5e423b2a43eb" | 30 | SRCREV = "cb72077e562a5a53e52f7ac94b0c3c26320c6242" |
diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend index 4aebde4..4860ea8 100644 --- a/recipes-qt/qt5/qttranslations_git.bbappend +++ b/recipes-qt/qt5/qttranslations_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "8ac63b28c45eace2f9b935b48257f97e0d07a9ca" | 30 | SRCREV = "38d6c3fe848487970640068ec12fc0c87a2938ee" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend index 0fb704d..a450ce8 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | inherit qtquickcompiler | 30 | inherit qtquickcompiler |
31 | 31 | ||
32 | SRCREV = "5e45faaf050752b18037ea518cd0b6909a9cc3ed" | 32 | SRCREV = "ad1da1a8c3be6ec804f3965b47d0762654f81731" |
33 | 33 | ||
34 | # To enabled Nuance T9 Write support, you need to provide the licensed components | 34 | # To enabled Nuance T9 Write support, you need to provide the licensed components |
35 | # and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file. | 35 | # and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file. |
diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index fc29f51..5e9bb70 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "e0186e009080e96f30f5e227e0f640c9db648325" | 30 | SRCREV = "19cdda76e8e1803c3c36252088e2f8d756e7cbea" |
diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index fc29f51..5e9bb70 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "e0186e009080e96f30f5e227e0f640c9db648325" | 30 | SRCREV = "19cdda76e8e1803c3c36252088e2f8d756e7cbea" |
diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend index 9f20f27..f6a143b 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bbappend +++ b/recipes-qt/qt5/qtwebchannel_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "23cd16ad672a3d07da00d14276a63901d8d9f118" | 30 | SRCREV = "d342edcc22d3c9c0299e86805d93e7031507345b" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index c5ae88f..0fa4d14 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend | |||
@@ -33,5 +33,5 @@ SRC_URI_append_mx6 = " \ | |||
33 | file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ | 33 | file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ |
34 | " | 34 | " |
35 | 35 | ||
36 | SRCREV_qtwebengine = "a833bc8e4e2a2545c8920c329b084a9373c261c5" | 36 | SRCREV_qtwebengine = "801356387748f237b7dc24f9772774573fd83ef0" |
37 | SRCREV_chromium = "168cc2b83c53e4e68bf89b331d92da88a99d2bf3" | 37 | SRCREV_chromium = "7f6555e9921bfff1886f1e63bb802c252281e882" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend index 3816f2f..85916fb 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bbappend +++ b/recipes-qt/qt5/qtwebsockets_git.bbappend | |||
@@ -27,4 +27,11 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "e7ba0d8e24828f7c0e44adc5db39bfd675094094" | 30 | LIC_FILES_CHKSUM = " \ |
31 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ | ||
32 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | ||
33 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
34 | file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ | ||
35 | " | ||
36 | |||
37 | SRCREV = "38d830d00fc2f8c196d736094448e55623e4b35e" | ||
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend index 88338dc..f6e93db 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend +++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "8fdcecab85b9f89b288456f16f6b729f6fff2372" | 30 | SRCREV = "30a4041893c8132040cd982c9ca1204345801750" |
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 3354dd2..474e293 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
@@ -25,7 +25,7 @@ | |||
25 | path="sources/meta-openembedded"/> | 25 | path="sources/meta-openembedded"/> |
26 | <project name="meta-qt5" | 26 | <project name="meta-qt5" |
27 | remote="qtyocto" | 27 | remote="qtyocto" |
28 | revision="2746cdba75f411541d80ddfd5cadad2753fe29d3" | 28 | revision="c82a99ecbeff88ff8a1f6eaa272a352e97992ab1" |
29 | path="sources/meta-qt5"/> | 29 | path="sources/meta-qt5"/> |
30 | <project name="meta-mingw" | 30 | <project name="meta-mingw" |
31 | remote="qtyocto" | 31 | remote="qtyocto" |