summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-08-27 17:44:52 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2017-09-05 05:58:25 +0000
commite7aec5e219486e10d4145ddd25df4ee6bd7246c9 (patch)
tree863317d0681862784a144f617ed2ca312a7f7825
parent7beedb16cd1ab7afd7ace29a2eea3f5f7d7140a3 (diff)
downloadmeta-qt5-e7aec5e219486e10d4145ddd25df4ee6bd7246c9.tar.gz
qt5: update submodules
Update submodules, change from dev to 5.10 branch Change-Id: Iaabd27a1b2db2a3d28d2f3d4377d1386a86646c2 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/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb3
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-missing-forward-declarations.patch31
-rw-r--r--recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch29
-rw-r--r--recipes-qt/qt5/qtbase_git.bb5
-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/0001-Make-mapbox-gl-build-configurable.patch6
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb4
-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/0001-Add-missing-includes-for-QColor.patch35
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb4
-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.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_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/0001-Force-host-toolchain-configuration.patch40
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb6
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch22
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb4
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
40 files changed, 105 insertions, 140 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 29a8438d..602ba50e 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
192addtask generate_qt_environment_file after do_install before do_package 192addtask generate_qt_environment_file after do_install before do_package
193 193
194SRCREV = "678ff94ff29db1b0faa4aa8d486d4df544ce3247" 194SRCREV = "f537dc0da288949c4df903c1f2b21156e62fbae5"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 2800def1..46610372 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
37SRCREV = "43c7f0bbdcc465d80aeb51328f9154ef1631c769" 37SRCREV = "5c99313eedada4e502b57798122ab20d71eca0fe"
38 38
39BBCLASSEXTEND += "native nativesdk" 39BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 78c754ce..c17b2bbb 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
2# Copyright (C) 2013-2016 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2016 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "dev" 5QT_MODULE_BRANCH ?= "5.10"
6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" 6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
7 7
8# each module needs to define valid SRCREV 8# each module needs to define valid SRCREV
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index e3ef6d92..50e894b5 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -33,6 +33,7 @@ SRC_URI += "\
33SRC_URI += " \ 33SRC_URI += " \
34 file://0011-Always-build-uic.patch \ 34 file://0011-Always-build-uic.patch \
35 file://0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch \ 35 file://0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch \
36 file://0001-Disable-unnamed-tmp-files.patch \
36" 37"
37 38
38CLEANBROKEN = "1" 39CLEANBROKEN = "1"
@@ -109,4 +110,4 @@ do_install() {
109 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}
110} 111}
111 112
112SRCREV = "678ff94ff29db1b0faa4aa8d486d4df544ce3247" 113SRCREV = "f537dc0da288949c4df903c1f2b21156e62fbae5"
diff --git a/recipes-qt/qt5/qtbase/0001-Add-missing-forward-declarations.patch b/recipes-qt/qt5/qtbase/0001-Add-missing-forward-declarations.patch
deleted file mode 100644
index 8f0f392c..00000000
--- a/recipes-qt/qt5/qtbase/0001-Add-missing-forward-declarations.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From a3ad110da2320174057671ec3b0df2447f0f728b Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 20 Jun 2017 13:45:20 +0300
4Subject: [PATCH] Add missing forward declarations
5
6fix build with -no-accessibility
7
8Change-Id: Ia58c11b22f08a51d5978e4a002480d265aa10fbd
9---
10 src/widgets/styles/qstylehelper_p.h | 4 ++++
11 1 file changed, 4 insertions(+)
12
13diff --git a/src/widgets/styles/qstylehelper_p.h b/src/widgets/styles/qstylehelper_p.h
14index 8ca2139..777ad95 100644
15--- a/src/widgets/styles/qstylehelper_p.h
16+++ b/src/widgets/styles/qstylehelper_p.h
17@@ -62,10 +62,14 @@
18
19 QT_BEGIN_NAMESPACE
20
21+class QColor;
22+class QObject;
23 class QPainter;
24+class QPalette;
25 class QPixmap;
26 class QStyleOptionSlider;
27 class QStyleOption;
28+class QWidget;
29 class QWindow;
30
31 namespace QStyleHelper
diff --git a/recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch b/recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch
new file mode 100644
index 00000000..098e2fa7
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch
@@ -0,0 +1,29 @@
1From 853fc888f38d6ad0e189ba54ef648abe0ff5bb60 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 28 Aug 2017 15:36:17 +0300
4Subject: [PATCH] Disable unnamed tmp files
5
6qmake does not work together with pseudo when unnamed temporary files
7(O_TMPFILE) are used.
8
9Upstream-Status: Inappropriate [OE specific]
10[YOCTO #11996]
11Change-Id: I9be92312c3e9a80438c1dc01344cb1ad721ad466
12Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
13---
14 src/corelib/io/qtemporaryfile_p.h | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/src/corelib/io/qtemporaryfile_p.h b/src/corelib/io/qtemporaryfile_p.h
18index 46a0d7a..3b418c9 100644
19--- a/src/corelib/io/qtemporaryfile_p.h
20+++ b/src/corelib/io/qtemporaryfile_p.h
21@@ -58,7 +58,7 @@
22 #include "private/qfile_p.h"
23 #include "qtemporaryfile.h"
24
25-#ifdef Q_OS_LINUX
26+#if 0
27 # include <fcntl.h>
28 # ifdef O_TMPFILE
29 // some early libc support had the wrong values for O_TMPFILE
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 62e62ad5..d0e98675 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -22,8 +22,7 @@ SRC_URI += "\
22 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 22 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
23 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ 23 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \
24 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 24 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
25 file://0001-Add-missing-forward-declarations.patch \ 25 "
26"
27 26
28DEPENDS += "qtbase-native" 27DEPENDS += "qtbase-native"
29 28
@@ -183,4 +182,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
183 182
184RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 183RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
185 184
186SRCREV = "678ff94ff29db1b0faa4aa8d486d4df544ce3247" 185SRCREV = "f537dc0da288949c4df903c1f2b21156e62fbae5"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index 137f0348..77bfcb47 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 = "eb28146d3f2984a29a8917a36c1327e1d0becec7" 13SRCREV = "3241a817e0c25da7ee682c8274d859757eeb5839"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 671ea5d0..77b00542 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "81d0c42c7e4b781365556e1e8d1c8de1e592ae47" 11SRCREV = "0168fe1f95d56850734447b118cdcf1847da1c51"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index b4e88e99..8936699b 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 = "c961434d37eefa83e824ab3917480247a43045b8" 22SRCREV = "c3c3837b02919a26031d917003898e72585e300b"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 7501f9b4..1cb25bc4 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 = "53fcf914e278ed4395a4873af2b64272c5d7882c" 11SRCREV = "c54adde27f5aa723882ffc5f77fae86b3793b6e2"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 902ef91a..c6733f70 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
33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
34 34
35SRCREV = "55490690f81eba168b06a90e4a66cefc20b38252" 35SRCREV = "780e11cf38a98cd32b6a5aa44dbb4cbf0f5d5ff8"
36 36
37BBCLASSEXTEND =+ "native nativesdk" 37BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index d1568922..e6d75c93 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 = "d4c6ba6afe1d7a3165f1ac108fef6eb2b994175a" 17SRCREV = "ffa5a03da503c3cd00f960debf3f43b85958c874"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index b44821f7..d48e1134 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -14,4 +14,4 @@ DEPENDS += "qtdeclarative"
14 14
15RDEPENDS_${PN}-dev = "" 15RDEPENDS_${PN}-dev = ""
16 16
17SRCREV = "8ffe4cc5244f9d2dfa0f9444f2aa86c74dc593c8" 17SRCREV = "045174c411f89863165610c1f6135ef4bd3d0889"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 6b9ebd38..f02e57b8 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 = "2b7fadfd9c0fc084588af2074f9731041632ec22" 29SRCREV = "36fdeb50941e3e2b0c4cd1b3343c3e337534357d"
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
index 5e452c03..ea8b8827 100644
--- a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch
+++ b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch
@@ -1,4 +1,4 @@
1From 632cfa131a890d42275873a7ca8cdf95ada61360 Mon Sep 17 00:00:00 2001 1From 3f88a23ead8da8bd3e3ef354f0afe8ddedcccc41 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 7 Jun 2017 13:29:29 +0300 3Date: Wed, 7 Jun 2017 13:29:29 +0300
4Subject: [PATCH] Make mapbox-gl build configurable 4Subject: [PATCH] Make mapbox-gl build configurable
@@ -13,7 +13,7 @@ Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro 15diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro
16index 459897a..d97e05d 100644 16index 07c3479..55d0040 100644
17--- a/src/plugins/geoservices/geoservices.pro 17--- a/src/plugins/geoservices/geoservices.pro
18+++ b/src/plugins/geoservices/geoservices.pro 18+++ b/src/plugins/geoservices/geoservices.pro
19@@ -6,7 +6,7 @@ qtConfig(concurrent) { 19@@ -6,7 +6,7 @@ qtConfig(concurrent) {
@@ -22,6 +22,6 @@ index 459897a..d97e05d 100644
22 22
23-qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx { 23-qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
24+mapboxgl:qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx { 24+mapboxgl:qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
25 !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) { 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.") 26 warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
27 } else { 27 } else {
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index ac8b5f35..22131b63 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -28,7 +28,7 @@ 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 \ 28 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
29 " 29 "
30 30
31SRCREV_qtlocation = "7bd7815f613c6f1ae0215d0b6a0ab5b7a6e72a59" 31SRCREV_qtlocation = "b68b88373beb884c77ec9813cac1e9a79854b957"
32SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b" 32SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead"
33 33
34SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 34SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index ad0a7e11..1a523cb7 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
32SRCREV = "7fdb88a86b0782e7170eefe3dfe7ab3e9c81f847" 32SRCREV = "c341b2b25697f937280fe3620629ac3d32c19613"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index 6f334bf9..df060c13 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 = "aa52bdacbff744c2bf20845f8c0a78aeb21d9878" 12SRCREV = "461a29be564271ef3a6ca1728f5e48ec2d25c08d"
diff --git a/recipes-qt/qt5/qtquickcontrols2/0001-Add-missing-includes-for-QColor.patch b/recipes-qt/qt5/qtquickcontrols2/0001-Add-missing-includes-for-QColor.patch
deleted file mode 100644
index b1b28f7e..00000000
--- a/recipes-qt/qt5/qtquickcontrols2/0001-Add-missing-includes-for-QColor.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From df04226fe0bc6d372e1c237527d0d0c9ea39bca4 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 20 Jun 2017 13:43:41 +0300
4Subject: [PATCH] Add missing includes for QColor
5
6Change-Id: I1bb5b4653bdc9d7b4fab61df99035715fa280fcd
7---
8 src/imports/controls/qquickdefaultbusyindicator_p.h | 1 +
9 src/imports/controls/qquickdefaultprogressbar_p.h | 1 +
10 2 files changed, 2 insertions(+)
11
12diff --git a/src/imports/controls/qquickdefaultbusyindicator_p.h b/src/imports/controls/qquickdefaultbusyindicator_p.h
13index e214020..f327c8d 100644
14--- a/src/imports/controls/qquickdefaultbusyindicator_p.h
15+++ b/src/imports/controls/qquickdefaultbusyindicator_p.h
16@@ -49,6 +49,7 @@
17 //
18
19 #include <QtQuick/qquickitem.h>
20+#include <QtGui/qcolor.h>
21
22 QT_BEGIN_NAMESPACE
23
24diff --git a/src/imports/controls/qquickdefaultprogressbar_p.h b/src/imports/controls/qquickdefaultprogressbar_p.h
25index dbdf5ad..91f8056 100644
26--- a/src/imports/controls/qquickdefaultprogressbar_p.h
27+++ b/src/imports/controls/qquickdefaultprogressbar_p.h
28@@ -49,6 +49,7 @@
29 //
30
31 #include <QtQuick/qquickitem.h>
32+#include <QtGui/qcolor.h>
33
34 QT_BEGIN_NAMESPACE
35
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index aff91025..d3f3a08e 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,6 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtdeclarative" 11DEPENDS += "qtdeclarative"
12 12
13SRC_URI += "file://0001-Add-missing-includes-for-QColor.patch" 13SRCREV = "4200f7117973969392be48b0c82f1b4bc214e546"
14
15SRCREV = "20d141034b48ae73eee70743dc410d35491cd00f"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 1c23fed5..d176d1b5 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -24,4 +24,4 @@ SRC_URI += " \
24 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 24 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
25" 25"
26 26
27SRCREV = "9f085b889524a80d4064d6ac01dbdc817bb31060" 27SRCREV = "caa38d217ecbcaaa5617255290598012477c4492"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index 4622e17f..e4e32b76 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -22,6 +22,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
22 22
23EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 23EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
24 24
25SRCREV = "0f80a0ad9f80f9f78dc9e9efe8b601dea2487322" 25SRCREV = "d2269c4e68f283f704547a0a96a662b5feeea732"
26 26
27BBCLASSEXTEND += "native nativesdk" 27BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 8e127a6d..668a2f30 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -25,4 +25,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
25 25
26DEPENDS += "qtbase" 26DEPENDS += "qtbase"
27 27
28SRCREV = "0ac21330b6cf5f95d733f16ff16614879000b588" 28SRCREV = "3d44bf7ce2a45d461f1d74a3f1dbdff313845898"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 452e6ccd..301ed0ab 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 = "5b89e61c39fb253dae46a8aa48d341a3fd37b4b4" 13SRCREV = "3ba4176568867cb146c2b758cd39461367ad22d1"
14 14
15SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" 15SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
16 16
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index d6c3ac26..fb4c496f 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 = "c0fe554f498025067edd78e75e3efb46868f8fe6" 15SRCREV = "b2e6b77c0862aba5d9f9fc979db8f2d84e47a78a"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index c42be4b8..2166d82d 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 = "e257664ae65ce5c51c7edac0a1a9ffaba4baea70" 14SRCREV = "bec0f13fa456d3b52deb6dbb7add5e81b7734fa4"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 9eabd1b7..37a99d32 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "55aa81e9acc736d162d3e4f775814ac91dbf1a80" 18SRCREV = "004289a1b7e5ff5c4f19fab3c3d41c009429b352"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index beab9315..bf632bb0 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "0781b64b56ea1116bf5bf214df782772c09f27ca" 15SRCREV = "dc9e39eb679946e82bf3b1a82f5c49737f9994b2"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 1b811eaf..de2da9c5 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -27,7 +27,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
27 27
28EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 28EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
29 29
30SRCREV = "36defe5725bbed8e03d4f0ef676bc6afa99e6b04" 30SRCREV = "8492e448666931a33d53a52df31ac2fd796239a5"
31 31
32BBCLASSEXTEND = "native nativesdk" 32BBCLASSEXTEND = "native nativesdk"
33 33
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 38c710f8..37cd0083 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
50DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 50DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
51 51
52SRCREV = "7c770c6e510d6c2274fd10a10e6f812672e3a6d1" 52SRCREV = "d80646f8f11283ad4bd9996d5a59a1154e7f651d"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 4271a783..03e2eb6c 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 = "dbf418dce41fe08368d38a098a771348a5b3d0fd" 40SRCREV = "e99dae74353e5652794d7bcbcd3d79b1478debbc"
41 41
42# From https://bugreports.qt.io/browse/QTBUG-57767 42# From https://bugreports.qt.io/browse/QTBUG-57767
43SRC_URI += " \ 43SRC_URI += " \
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index ecd7f0d8..37a0c403 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 = "2dd6a5e7ff769e54065ae8b9b532b2e56f2e3116" 15SRCREV = "749951c19cbb7d301bed20f24d16dd4e713485c2"
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
index e10d3b82..148b0629 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From 5c879db32cde9bee9c9073842ecc281172f19453 Mon Sep 17 00:00:00 2001 1From e7d1e5dfdece59f247a1d71ad0ca1b0c8cadda21 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] Force host toolchain configuration 4Subject: [PATCH] Force host toolchain configuration
@@ -6,17 +6,32 @@ Subject: [PATCH] Force host toolchain configuration
6Force gcc/g++ to be used for parts using host toolchain, since 6Force gcc/g++ to be used for parts using host toolchain, since
7the option(host_build) does not work in yocto builds. 7the option(host_build) does not work in yocto builds.
8 8
9Don't use QT_ARCH for the host architecture, since that's always
10the target architecture in bitbake builds, instead ask specifically
11for the qmakes's host architecture.
12
13Change-Id: I38329d545e527dbc5892547b6951822171ab761f
9Upstream-Status: Inappropriate [OE specific] 14Upstream-Status: Inappropriate [OE specific]
10Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 15Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
11--- 16---
12 src/buildtools/configure_host.pro | 12 ++++++------ 17 src/buildtools/configure_host.pro | 14 +++++++-------
13 1 file changed, 6 insertions(+), 6 deletions(-) 18 src/core/config/linux.pri | 2 +-
19 2 files changed, 8 insertions(+), 8 deletions(-)
14 20
15diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro 21diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
16index d8d731d..89dade4 100644 22index f1b3d47..1212372 100644
17--- a/src/buildtools/configure_host.pro 23--- a/src/buildtools/configure_host.pro
18+++ b/src/buildtools/configure_host.pro 24+++ b/src/buildtools/configure_host.pro
19@@ -16,9 +16,9 @@ GN_CONTENTS = \ 25@@ -4,7 +4,7 @@ TEMPLATE = aux
26 # Pick up the host toolchain
27 option(host_build)
28
29-GN_HOST_CPU = $$gnArch($$QT_ARCH)
30+GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
31 !isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH)
32 else: GN_TARGET_CPU = $$GN_HOST_CPU
33 GN_OS = $$gnOS()
34@@ -29,9 +29,9 @@ GN_CONTENTS = \
20 "import(\"//build/config/sysroot.gni\")" \ 35 "import(\"//build/config/sysroot.gni\")" \
21 "import(\"//build/toolchain/gcc_toolchain.gni\")" \ 36 "import(\"//build/toolchain/gcc_toolchain.gni\")" \
22 "gcc_toolchain(\"host\") {" \ 37 "gcc_toolchain(\"host\") {" \
@@ -29,7 +44,7 @@ index d8d731d..89dade4 100644
29 " ar = \"$$which(ar)\" " \ 44 " ar = \"$$which(ar)\" " \
30 " nm = \"$$which(nm)\" " \ 45 " nm = \"$$which(nm)\" " \
31 " toolchain_args = { " \ 46 " toolchain_args = { " \
32@@ -27,9 +27,9 @@ GN_CONTENTS = \ 47@@ -42,9 +42,9 @@ GN_CONTENTS = \
33 " } " \ 48 " } " \
34 "}" \ 49 "}" \
35 "gcc_toolchain(\"v8_snapshot\") {" \ 50 "gcc_toolchain(\"v8_snapshot\") {" \
@@ -42,6 +57,19 @@ index d8d731d..89dade4 100644
42 " ar = \"$$which(ar)\" " \ 57 " ar = \"$$which(ar)\" " \
43 " nm = \"$$which(nm)\" " \ 58 " nm = \"$$which(nm)\" " \
44 " toolchain_args = { " \ 59 " toolchain_args = { " \
60diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
61index 714c864..f66ca55 100644
62--- a/src/core/config/linux.pri
63+++ b/src/core/config/linux.pri
64@@ -98,7 +98,7 @@ contains(QT_ARCH, "mips"):!host_build {
65
66 host_build {
67 gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
68- GN_HOST_CPU = $$gnArch($$QT_ARCH)
69+ GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
70 gn_args += host_cpu=\"$$GN_HOST_CPU\"
71 # Don't bother trying to use system libraries in this case
72 gn_args += use_glib=false
45diff --git a/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py b/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py 73diff --git a/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py b/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
46index 75b9690..601f688 100755 74index 75b9690..601f688 100755
47--- a/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py 75--- a/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 74e003b6..0c5fbf90 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -104,7 +104,7 @@ RDEPENDS_${PN}-examples += " \
104 qtdeclarative-qmlplugins \ 104 qtdeclarative-qmlplugins \
105" 105"
106 106
107QT_MODULE_BRANCH_CHROMIUM = "56-based" 107QT_MODULE_BRANCH_CHROMIUM = "58-based"
108 108
109SRC_URI += " \ 109SRC_URI += " \
110 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 110 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
@@ -113,8 +113,8 @@ 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
116SRCREV_qtwebengine = "fa19227c3ac7df7c0d2f8a548a9a36ac9a7b803c" 116SRCREV_qtwebengine = "647307f534d45758832f23912ed281af819f0174"
117SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05" 117SRCREV_chromium = "582c5493439ba9ac57c6c14c706f530741f5bfc8"
118SRCREV = "${SRCREV_qtwebengine}" 118SRCREV = "${SRCREV_qtwebengine}"
119 119
120SRCREV_FORMAT = "qtwebengine_chromium" 120SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index fa775946..dd618b10 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 = "26e56e18eb234df4a782737cd3c8d8d11daead2c" 14SRCREV = "fdb6d8370f9ae8fa148124289317c108399853c3"
diff --git a/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch b/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch
deleted file mode 100644
index 82087b9a..00000000
--- a/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1From b946b6ea4a2a30bd12ecd036e40c9ef671681ba8 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 2 Jun 2017 13:12:18 +0300
4Subject: [PATCH] Add missing include for qWarning
5
6Change-Id: I7c7699e7a2b7ce59e4f659d460ec835f59bba439
7---
8 src/webview/qquickwebview.cpp | 1 +
9 1 file changed, 1 insertion(+)
10
11diff --git a/src/webview/qquickwebview.cpp b/src/webview/qquickwebview.cpp
12index d760564..fbbbfd6 100644
13--- a/src/webview/qquickwebview.cpp
14+++ b/src/webview/qquickwebview.cpp
15@@ -39,6 +39,7 @@
16 #include <QtWebView/private/qwebviewloadrequest_p.h>
17 #include <QtQml/qqmlengine.h>
18 #include <QtCore/qmutex.h>
19+#include <QtCore/QDebug>
20
21 namespace {
22
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index cdf465d6..4b9e0be8 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = " \
9require qt5.inc 9require qt5.inc
10require qt5-git.inc 10require qt5-git.inc
11 11
12SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch"
13
14DEPENDS += "qtbase qtwebengine" 12DEPENDS += "qtbase qtwebengine"
15 13
16SRCREV = "22e7f1941fbbb7aa7212faabf5939b6d2ca7bd49" 14SRCREV = "7e71daf48c2ee3c3518cbfe6103d212772ccf414"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 620e0430..bc2557c4 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 = "915ee2598030b799aeb67908bae49a70b4079e37" 16SRCREV = "9749c5085dc21d2064177aa748f3a9395592a7cf"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index af70b9f4..7a363175 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -16,6 +16,6 @@ LIC_FILES_CHKSUM = " \
16 16
17DEPENDS += "qtbase" 17DEPENDS += "qtbase"
18 18
19SRCREV = "c9a4897aa09d723d22b842b1fabcc296bf3c7f91" 19SRCREV = "fee0795ca96079a8f37473d3aec18757d1e52d24"
20 20
21BBCLASSEXTEND =+ "native nativesdk" 21BBCLASSEXTEND =+ "native nativesdk"