diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-09-06 11:21:21 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-09-18 08:17:36 +0000 |
commit | 5d583afc7156521d15f85d1f4c197d57d5f63322 (patch) | |
tree | fb6503a97dae4e9d16bbae13db6a8246bf4c40da | |
parent | f8bd95146a0745e3d980f39f8cac1fbe6d7ad0eb (diff) | |
download | meta-qt5-5d583afc7156521d15f85d1f4c197d57d5f63322.tar.gz |
qt5: update submodules
Update submodules to Qt 5.10 Alpha
Change-Id: I3fe9433c00d5588b179acb676d6db4680596a0df
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtcanvas3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtcharts_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtconnectivity_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch | 27 | ||||
-rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 7 | ||||
-rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtnetworkauth_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols2_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtserialbus_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qttranslations_git.bb | 9 | ||||
-rw-r--r-- | recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtx11extras_git.bb | 2 |
20 files changed, 22 insertions, 55 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 602ba50e..4d9e77f0 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 = "f537dc0da288949c4df903c1f2b21156e62fbae5" | 194 | SRCREV = "037652d7a258535bd92e6950ff46398e2e74e728" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 46610372..7c20badf 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -34,6 +34,6 @@ do_configure_prepend() { | |||
34 | ${S}/src/quick3d/imports/input/importsinput.pro | 34 | ${S}/src/quick3d/imports/input/importsinput.pro |
35 | } | 35 | } |
36 | 36 | ||
37 | SRCREV = "5c99313eedada4e502b57798122ab20d71eca0fe" | 37 | SRCREV = "8a4b9ebadb9e63ae367694f04786c7faf6306f27" |
38 | 38 | ||
39 | BBCLASSEXTEND += "native nativesdk" | 39 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 50e894b5..2a3a0e6c 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -110,4 +110,4 @@ do_install() { | |||
110 | install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} | 110 | install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} |
111 | } | 111 | } |
112 | 112 | ||
113 | SRCREV = "f537dc0da288949c4df903c1f2b21156e62fbae5" | 113 | SRCREV = "037652d7a258535bd92e6950ff46398e2e74e728" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 5500a749..72d957a1 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -183,4 +183,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
183 | 183 | ||
184 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 184 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
185 | 185 | ||
186 | SRCREV = "f537dc0da288949c4df903c1f2b21156e62fbae5" | 186 | SRCREV = "037652d7a258535bd92e6950ff46398e2e74e728" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 77bfcb47..455ef3e5 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 = "3241a817e0c25da7ee682c8274d859757eeb5839" | 13 | SRCREV = "5be124d7373c36daf9a6c01712e6eab057bbf56d" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 77b00542..f803abdc 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 = "0168fe1f95d56850734447b118cdcf1847da1c51" | 11 | SRCREV = "c245b25dd2ed8b9e141ac85b77f58d3522815823" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 8936699b..51d05594 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 | ||
20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
21 | 21 | ||
22 | SRCREV = "c3c3837b02919a26031d917003898e72585e300b" | 22 | SRCREV = "ed5a1134d50f6dbed3fc568c799a39f4e2338056" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index c6733f70..7bd64966 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -32,6 +32,6 @@ do_install_append_class-nativesdk() { | |||
32 | 32 | ||
33 | 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)}" |
34 | 34 | ||
35 | SRCREV = "780e11cf38a98cd32b6a5aa44dbb4cbf0f5d5ff8" | 35 | SRCREV = "00adacd7934d7553eaea7c6d2b43bcb3df439e3e" |
36 | 36 | ||
37 | BBCLASSEXTEND =+ "native nativesdk" | 37 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch deleted file mode 100644 index ea8b8827..00000000 --- a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 3f88a23ead8da8bd3e3ef354f0afe8ddedcccc41 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Wed, 7 Jun 2017 13:29:29 +0300 | ||
4 | Subject: [PATCH] Make mapbox-gl build configurable | ||
5 | |||
6 | mapbox-gl-native won't compile for ARMv5 or older, so disable the | ||
7 | build by default. | ||
8 | |||
9 | Task-number: QTBUG-61289 | ||
10 | Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b | ||
11 | --- | ||
12 | src/plugins/geoservices/geoservices.pro | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro | ||
16 | index 07c3479..55d0040 100644 | ||
17 | --- a/src/plugins/geoservices/geoservices.pro | ||
18 | +++ b/src/plugins/geoservices/geoservices.pro | ||
19 | @@ -6,7 +6,7 @@ qtConfig(concurrent) { | ||
20 | SUBDIRS += osm | ||
21 | } | ||
22 | |||
23 | -qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx { | ||
24 | +mapboxgl:qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx { | ||
25 | !exists(../../3rdparty/mapbox-gl-native/mapbox-gl-native.pro) { | ||
26 | warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") | ||
27 | } else { | ||
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 22131b63..49d9b461 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -13,22 +13,19 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" | 14 | DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" |
15 | 15 | ||
16 | SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch" | ||
17 | |||
18 | PACKAGECONFIG ??= "" | 16 | PACKAGECONFIG ??= "" |
19 | # older geoclue 0.12.99 is needed | 17 | # older geoclue 0.12.99 is needed |
20 | PACKAGECONFIG[geoclue] = ",,geoclue" | 18 | PACKAGECONFIG[geoclue] = ",,geoclue" |
21 | PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" | 19 | PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" |
22 | PACKAGECONFIG[mapboxgl] = "" | 20 | PACKAGECONFIG[geoservices_mapboxgl] = "-feature-geoservices_mapboxgl,-no-feature-geoservices_mapboxgl" |
23 | 21 | ||
24 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'mapboxgl', 'CONFIG+=mapboxgl', '', d)}" | ||
25 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 22 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
26 | 23 | ||
27 | SRC_URI += " \ | 24 | SRC_URI += " \ |
28 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 25 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
29 | " | 26 | " |
30 | 27 | ||
31 | SRCREV_qtlocation = "b68b88373beb884c77ec9813cac1e9a79854b957" | 28 | SRCREV_qtlocation = "3f2c6d8af0367c5e87eb38d348c99e2e2a2f0a76" |
32 | SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead" | 29 | SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead" |
33 | 30 | ||
34 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 31 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 1a523cb7..826703ab 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -29,4 +29,4 @@ SRC_URI += "\ | |||
29 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ | 29 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ |
30 | " | 30 | " |
31 | 31 | ||
32 | SRCREV = "c341b2b25697f937280fe3620629ac3d32c19613" | 32 | SRCREV = "230f070c7ed353605260f9fa79d0a5bc5181321c" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index df060c13..a120d7d4 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 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "461a29be564271ef3a6ca1728f5e48ec2d25c08d" | 12 | SRCREV = "4e681472f6e25153745151f2b41a8ebf4bc94f54" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index d3f3a08e..dbfd1129 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 = "4200f7117973969392be48b0c82f1b4bc214e546" | 13 | SRCREV = "bc6e79ebab8f7556aa2c7cd4352ba24509bd4792" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 2166d82d..cba6340b 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 = "bec0f13fa456d3b52deb6dbb7add5e81b7734fa4" | 14 | SRCREV = "b2e4e7a49990a68915820df525680b9c70971527" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index de2da9c5..cb86439c 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -27,7 +27,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
27 | 27 | ||
28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
29 | 29 | ||
30 | SRCREV = "8492e448666931a33d53a52df31ac2fd796239a5" | 30 | SRCREV = "1ace238ce0347857a5ba55d6fa30ba81fed204b9" |
31 | 31 | ||
32 | BBCLASSEXTEND = "native nativesdk" | 32 | BBCLASSEXTEND = "native nativesdk" |
33 | 33 | ||
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 02ec4bbb..70910c15 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -1,12 +1,9 @@ | |||
1 | require qt5.inc | 1 | require qt5.inc |
2 | require qt5-git.inc | 2 | require qt5-git.inc |
3 | 3 | ||
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 = "GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ | 6 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
7 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | ||
8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
10 | " | 7 | " |
11 | 8 | ||
12 | DEPENDS += "qtbase qttools-native" | 9 | DEPENDS += "qtbase qttools-native" |
@@ -114,4 +111,4 @@ FILES_${PN}-qt = " \ | |||
114 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ | 111 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ |
115 | " | 112 | " |
116 | 113 | ||
117 | SRCREV = "e51b921f6fa0fb64a8a7f4159024d1a2f1872772" | 114 | SRCREV = "4f744d427a5bfd698dcdad394666a72ccbb79a3c" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 37cd0083..ff80b2e6 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 = "d80646f8f11283ad4bd9996d5a59a1154e7f651d" | 52 | SRCREV = "1f72424b80ac1b84b4f040f195d74d9f2b646a62" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 03e2eb6c..ebb69b6f 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 | ||
38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
39 | 39 | ||
40 | SRCREV = "e99dae74353e5652794d7bcbcd3d79b1478debbc" | 40 | SRCREV = "1e6063f6fc9fa02bd2f12ad9e60cbc2529fc0377" |
41 | 41 | ||
42 | # From https://bugreports.qt.io/browse/QTBUG-57767 | 42 | # From https://bugreports.qt.io/browse/QTBUG-57767 |
43 | SRC_URI += " \ | 43 | SRC_URI += " \ |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 0c5fbf90..c044c602 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -113,7 +113,7 @@ SRC_URI += " \ | |||
113 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ | 113 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ |
114 | " | 114 | " |
115 | 115 | ||
116 | SRCREV_qtwebengine = "647307f534d45758832f23912ed281af819f0174" | 116 | SRCREV_qtwebengine = "f32b3514a5186bc4f5452f004324bdb7782d30a3" |
117 | SRCREV_chromium = "582c5493439ba9ac57c6c14c706f530741f5bfc8" | 117 | SRCREV_chromium = "582c5493439ba9ac57c6c14c706f530741f5bfc8" |
118 | SRCREV = "${SRCREV_qtwebengine}" | 118 | SRCREV = "${SRCREV_qtwebengine}" |
119 | 119 | ||
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index bc2557c4..2d4e4139 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 = "9749c5085dc21d2064177aa748f3a9395592a7cf" | 16 | SRCREV = "ec2c0f4db6350a304dcf901b9adbadc895864c14" |