diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-05-02 15:09:31 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-05-08 14:40:32 +0000 |
commit | bc1327c8aab6ec63d104971dbbaa38ce9714412f (patch) | |
tree | 1984c2830dd01e3a48d26d1d742af3d6acb4ac87 | |
parent | 7c0e98422ea79751889cf36fa62bb2f878401efc (diff) | |
download | meta-qt5-bc1327c8aab6ec63d104971dbbaa38ce9714412f.tar.gz |
qt5: update submodules
* Update 5.9.0 submodules to Beta 4 (snapshot 1)
* License file cleanup for several recipes
Change-Id: Idc0b99f29a5feacf264fc668bc70129e2ed2458e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
26 files changed, 29 insertions, 51 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 69bed510..8dc7f66c 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -191,4 +191,4 @@ fakeroot do_generate_qt_environment_file() { | |||
191 | 191 | ||
192 | addtask generate_qt_environment_file after do_install before do_package | 192 | addtask generate_qt_environment_file after do_install before do_package |
193 | 193 | ||
194 | SRCREV = "b1131074199aae97b2a005cba871f6baf2a32c63" | 194 | SRCREV = "464a43d43c2bb2440d4ad745bc134e0dac10872c" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 3d283345..f43b884b 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -109,4 +109,4 @@ do_install() { | |||
109 | install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} | 109 | install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} |
110 | } | 110 | } |
111 | 111 | ||
112 | SRCREV = "b1131074199aae97b2a005cba871f6baf2a32c63" | 112 | SRCREV = "464a43d43c2bb2440d4ad745bc134e0dac10872c" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 457d5255..42168355 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -182,4 +182,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
182 | 182 | ||
183 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 183 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
184 | 184 | ||
185 | SRCREV = "b1131074199aae97b2a005cba871f6baf2a32c63" | 185 | SRCREV = "464a43d43c2bb2440d4ad745bc134e0dac10872c" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 21c39531..de154eff 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS = "qtdeclarative" | 11 | DEPENDS = "qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "08458d0dcfba8421c03ed9c7dec7435619f0b70d" | 13 | SRCREV = "6717956ed4b886defbb158b46b6ab572984c0891" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index c6f0d3da..317adf09 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb | |||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" |
10 | 10 | ||
11 | SRCREV = "cc4e79d6200b0495a5c4d1a7faa773906b1ac99e" | 11 | SRCREV = "b7ded4e4216987d28be92cf8309a38c6dc18961b" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index b5be307d..fb8b4124 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -4,13 +4,9 @@ require qt5-git.inc | |||
4 | LICENSE = "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 )" | 4 | LICENSE = "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 )" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | 6 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ |
7 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ | ||
8 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | ||
9 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 7 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 8 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 9 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
12 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
13 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
14 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
15 | " | 11 | " |
16 | 12 | ||
@@ -23,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" | |||
23 | 19 | ||
24 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
25 | 21 | ||
26 | SRCREV = "5391a325eadcee86a494aa96a3f8edae1be55556" | 22 | SRCREV = "ec0fb110eccb237a230fec61e02740de9c74fe1f" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 53792794..25169beb 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb | |||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" |
10 | 10 | ||
11 | SRCREV = "73ec35fa12a4b150670ea93d3021ca8e658063e1" | 11 | SRCREV = "1a1dc5abdbc15a61e9447d9a4f0b32337a61202f" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 693204f1..0a727d8f 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -4,13 +4,9 @@ require qt5-git.inc | |||
4 | LICENSE = "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 )" | 4 | LICENSE = "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 )" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | 6 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ |
7 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ | ||
8 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | ||
9 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 7 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 8 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 9 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
12 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
13 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
14 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
15 | " | 11 | " |
16 | 12 | ||
@@ -36,6 +32,6 @@ do_install_append_class-nativesdk() { | |||
36 | 32 | ||
37 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 33 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
38 | 34 | ||
39 | SRCREV = "93bc4113f06dce4c942374d765bef20054cd1f94" | 35 | SRCREV = "c6748dde37e12339cff209d6b0e05071679d4824" |
40 | 36 | ||
41 | BBCLASSEXTEND =+ "native nativesdk" | 37 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 165ed68e..94f04a49 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 | ||
15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
16 | 16 | ||
17 | SRCREV = "36846eca9ae810d213b2fe2ae5d9ff11137d4597" | 17 | SRCREV = "ef8850fee38e2552d535379a8477c9abebdf8bb4" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 024519ef..27130c63 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 | ||
27 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 27 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
28 | 28 | ||
29 | SRCREV = "c7a6a451a5c277556e28dfb3b4b943719cdda7ff" | 29 | SRCREV = "97f4198083ccdc61e5d8cbca8e19d5bef80936e2" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 225884bd..bd2f946a 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -24,7 +24,7 @@ SRC_URI += " \ | |||
24 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 24 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
25 | " | 25 | " |
26 | 26 | ||
27 | SRCREV_qtlocation = "c2691cf479c88ba0f74492195912cd9b62ce4e62" | 27 | SRCREV_qtlocation = "6e276607e507f36bd94c33652071cf0413c6ba3a" |
28 | SRCREV_qtlocation-mapboxgl = "fa9e435795a958b44d50a5cd9cfb4a83363c1923" | 28 | SRCREV_qtlocation-mapboxgl = "c8515a949cef17abc90693bb8be264c37fc1626a" |
29 | 29 | ||
30 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 30 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 8a633111..2016a74b 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -4,13 +4,9 @@ require qt5-git.inc | |||
4 | LICENSE = "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 )" | 4 | LICENSE = "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 )" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | 6 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ |
7 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ | ||
8 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | ||
9 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 7 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 8 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 9 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
12 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
13 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
14 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
15 | " | 11 | " |
16 | 12 | ||
@@ -33,4 +29,4 @@ SRC_URI += "\ | |||
33 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ | 29 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ |
34 | " | 30 | " |
35 | 31 | ||
36 | SRCREV = "6b20032d91067e06f6ab5d4acf553812134236c7" | 32 | SRCREV = "960fbf083be4391314e8fe36994a133763dbbe7d" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 481aa558..eb5e4f61 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb | |||
@@ -1,7 +1,6 @@ | |||
1 | LICENSE = "BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial" | 1 | LICENSE = "BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial" |
2 | LIC_FILES_CHKSUM = " \ | 2 | LIC_FILES_CHKSUM = " \ |
3 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 3 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
4 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
5 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 4 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
6 | " | 5 | " |
7 | 6 | ||
@@ -10,4 +9,4 @@ require qt5-git.inc | |||
10 | 9 | ||
11 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
12 | 11 | ||
13 | SRCREV = "aeb49ab5e1d7ebe2aaff6579757dacae45579c84" | 12 | SRCREV = "86c5036848ad004208803d9d497cfcd08c9623d6" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 04ed7a4d..99d8499e 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtdeclarative" | 11 | DEPENDS += "qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "7faafa470eee71c51255e276e7b9df5beed2dd5b" | 13 | SRCREV = "932d5f78296e604c57c8ebcfe5c94f5ce62238f4" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 3612011b..b232cdee 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -26,4 +26,4 @@ SRC_URI += " \ | |||
26 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ | 26 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ |
27 | " | 27 | " |
28 | 28 | ||
29 | SRCREV = "ffc1cab21ade6fc4b0ab574dbb5507c677d32841" | 29 | SRCREV = "a218356f838c4be8aad8f447e8d6187a8af639ff" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 479602fa..e7a68581 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 | ||
11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" | 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" |
12 | 12 | ||
13 | SRCREV = "384cb7975d9caa4e508454d811d2e391763e5981" | 13 | SRCREV = "958d4d8ecfc7afcbc9b7c0855857d2a2e1cbfa9f" |
14 | 14 | ||
15 | SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" | 15 | SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" |
16 | 16 | ||
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 2d94982e..adaf3bf8 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtserialport" | 12 | DEPENDS += "qtbase qtserialport" |
13 | 13 | ||
14 | SRCREV = "0ac7bc6e57be2a7c2ee14bfaf7489e20daf3edc0" | 14 | SRCREV = "f9cd9f7da643274e0c39fd62b8b12a6a83fc203d" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 76e6dd6f..08955860 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtbase" | 16 | DEPENDS += "qtbase" |
17 | 17 | ||
18 | SRCREV = "d320f01018f0273e4fea2e0a7aa8f30ee8129587" | 18 | SRCREV = "d88ded29d968b8ccf41d4dffa73c3f8f030a9f5d" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index eb928931..4558a919 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -4,13 +4,9 @@ require qt5-git.inc | |||
4 | LICENSE = "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 )" | 4 | LICENSE = "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 )" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | 6 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ |
7 | file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \ | ||
8 | file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \ | ||
9 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 7 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 8 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 9 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
12 | file://LICENSE.GPLv3;md5=bfdd8aa675169432d6d9b63d056de148 \ | ||
13 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
14 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
15 | " | 11 | " |
16 | 12 | ||
@@ -20,7 +16,6 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns" | |||
20 | 16 | ||
21 | SRC_URI += " \ | 17 | SRC_URI += " \ |
22 | file://run-ptest \ | 18 | file://run-ptest \ |
23 | file://0003-add-noqtwebkit-configuration.patch \ | ||
24 | file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \ | 19 | file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \ |
25 | " | 20 | " |
26 | 21 | ||
@@ -32,7 +27,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
32 | 27 | ||
33 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
34 | 29 | ||
35 | SRCREV = "1a7bc520c5df4da80b7e65acbec1f546f9c87870" | 30 | SRCREV = "15db04e57cf8bcc2ba2fa3248a2928b23f4667ab" |
36 | 31 | ||
37 | BBCLASSEXTEND = "native nativesdk" | 32 | BBCLASSEXTEND = "native nativesdk" |
38 | 33 | ||
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 87ccfb97..5d4eb43d 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -114,4 +114,4 @@ FILES_${PN}-qt = " \ | |||
114 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ | 114 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ |
115 | " | 115 | " |
116 | 116 | ||
117 | SRCREV = "1b2c07c5fe056321586ce0b4e334398d77505a65" | 117 | SRCREV = "03747bd6edba87edd148e33698b439bc2e7aac5a" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 4a3fd5e8..6d45a508 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
@@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" | |||
49 | 49 | ||
50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" | 50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" |
51 | 51 | ||
52 | SRCREV = "bfa8da56b1edd77ec416c24b96d33db94368be80" | 52 | SRCREV = "bdf61afe76e94ef03da1332c4540646f18f5852f" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 75deae7a..b07ff816 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -7,13 +7,9 @@ DEPENDS_append_class-target = " libxkbcommon" | |||
7 | LICENSE = "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 )" | 7 | LICENSE = "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 )" |
8 | LIC_FILES_CHKSUM = " \ | 8 | LIC_FILES_CHKSUM = " \ |
9 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | 9 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ |
10 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ | ||
11 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | ||
12 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 10 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
13 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 11 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
14 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 12 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
15 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
16 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
17 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 13 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
18 | " | 14 | " |
19 | 15 | ||
@@ -41,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature | |||
41 | 37 | ||
42 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
43 | 39 | ||
44 | SRCREV = "e9bf98d2bf8c1d5d4f671bcb6146ed13de213f01" | 40 | SRCREV = "79c4e3292bac9664bc4114e18ad28d4a468b69f5" |
45 | 41 | ||
46 | # From https://bugreports.qt.io/browse/QTBUG-57767 | 42 | # From https://bugreports.qt.io/browse/QTBUG-57767 |
47 | SRC_URI += " \ | 43 | SRC_URI += " \ |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index e41e5e74..64ff9182 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -73,7 +73,7 @@ do_configure() { | |||
73 | -e 's/packagesExist(libwebp,libwebpdemux):/false:/g' \ | 73 | -e 's/packagesExist(libwebp,libwebpdemux):/false:/g' \ |
74 | -e 's/packagesExist(libxml-2.0,libxslt):/false:/g'\ | 74 | -e 's/packagesExist(libxml-2.0,libxslt):/false:/g'\ |
75 | -e 's/^ *packagesExist($$package):/false:/g' \ | 75 | -e 's/^ *packagesExist($$package):/false:/g' \ |
76 | -i ${S}/tools/qmake/mkspecs/features/configure.prf | 76 | -i ${S}/mkspecs/features/configure.prf |
77 | 77 | ||
78 | # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as | 78 | # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as |
79 | # arguments here | 79 | # arguments here |
@@ -112,8 +112,8 @@ SRC_URI += " \ | |||
112 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ | 112 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ |
113 | " | 113 | " |
114 | 114 | ||
115 | SRCREV_qtwebengine = "61e35009aa276e9d2d7ff1787b52ba06f8cde37f" | 115 | SRCREV_qtwebengine = "028bd20e41fc1995c34ca4c19e5342ff3efe0c6a" |
116 | SRCREV_chromium = "853d4069e45b06106f33611c458f5480f71e7c57" | 116 | SRCREV_chromium = "898afbbf79637101bbd5e6ab12695ced6a759ae7" |
117 | SRCREV = "${SRCREV_qtwebengine}" | 117 | SRCREV = "${SRCREV_qtwebengine}" |
118 | 118 | ||
119 | SRCREV_FORMAT = "qtwebengine_chromium" | 119 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 42c0e4a1..e42a7758 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "91582c53c5c3b404169ce2a44d75ac8102043513" | 14 | SRCREV = "cec66b8969215d7355aa61655e68893f7dad5595" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 3682aca2..bf03e9bb 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "8c44529ed5269bc2130c27ba9733d262143424ed" | 16 | SRCREV = "9e83ff8713c1a3f69ce514bf3e31335194668da7" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index df159709..85563862 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -16,6 +16,6 @@ LIC_FILES_CHKSUM = " \ | |||
16 | 16 | ||
17 | DEPENDS += "qtbase" | 17 | DEPENDS += "qtbase" |
18 | 18 | ||
19 | SRCREV = "da19c9882295a8f3216284935c05ad4b89c445bd" | 19 | SRCREV = "c1c3af0ae456247c9bcd30161d51a94c9b38dc52" |
20 | 20 | ||
21 | BBCLASSEXTEND =+ "native nativesdk" | 21 | BBCLASSEXTEND =+ "native nativesdk" |