summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-11-17 11:13:48 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2017-11-24 18:27:01 +0000
commitce3d695f02c9103c6b7d7ce2b1f98ffba15e6f9d (patch)
tree93aeb565726f7cb478e77bf765edcdc660ba1d22
parente015edf046a88ca13dd603265f71a6e05662db72 (diff)
downloadmeta-qt5-ce3d695f02c9103c6b7d7ce2b1f98ffba15e6f9d.tar.gz
qt5: update submodules
Update to latest 5.10.0 branch content Task-number: QTBUG-63728 Change-Id: Ie14ad07596547325d8229fb149ae22c3ac7e3bdd Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb9
-rw-r--r--recipes-qt/qt5/qtbase/0001-Bootstrap-without-linkat-feature.patch27
-rw-r--r--recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch29
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-QQmlTypeLoader-The-profiler-is-a-quintptr-0-if-QT_NO.patch32
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb4
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.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/qtquick1_git.bb5
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qtsystems_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
38 files changed, 69 insertions, 103 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index f3402edb..ace0bf08 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -197,4 +197,4 @@ fakeroot do_generate_qt_environment_file() {
197 197
198addtask generate_qt_environment_file after do_install before do_package 198addtask generate_qt_environment_file after do_install before do_package
199 199
200SRCREV = "f27e029ef2e8400b803cec1b17ffd4e244d8610a" 200SRCREV = "36984dc8cec09703290692ce7e899e88754173c4"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 9c1da93e..34e2423e 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -37,6 +37,6 @@ do_configure_prepend() {
37 ${S}/src/quick3d/imports/input/importsinput.pro 37 ${S}/src/quick3d/imports/input/importsinput.pro
38} 38}
39 39
40SRCREV = "3f03499bf8a7cf3c3f8d19a020179c1205980bde" 40SRCREV = "7bd57d2218794fdd7bcaa4f2c8107ef60740ff75"
41 41
42BBCLASSEXTEND += "native nativesdk" 42BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index f4e143f8..9a129619 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -37,13 +37,17 @@ SRC_URI += "\
37# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native 37# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native
38# 5.9.meta-qt5-native.2 38# 5.9.meta-qt5-native.2
39SRC_URI += " \ 39SRC_URI += " \
40 file://0001-Disable-unnamed-tmp-files.patch \
41 file://0009-Always-build-uic.patch \ 40 file://0009-Always-build-uic.patch \
42 file://0010-Add-OE-specific-specs-for-clang-compiler.patch \ 41 file://0010-Add-OE-specific-specs-for-clang-compiler.patch \
43 file://0011-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ 42 file://0011-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
44 file://0012-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ 43 file://0012-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
45" 44"
46 45
46# only for qtbase-native
47SRC_URI += " \
48 file://0001-Bootstrap-without-linkat-feature.patch \
49"
50
47CLEANBROKEN = "1" 51CLEANBROKEN = "1"
48 52
49XPLATFORM_toolchain-clang = "linux-oe-clang" 53XPLATFORM_toolchain-clang = "linux-oe-clang"
@@ -87,6 +91,7 @@ PACKAGECONFIG_CONFARGS = " \
87 -nomake examples \ 91 -nomake examples \
88 -nomake tests \ 92 -nomake tests \
89 -no-rpath \ 93 -no-rpath \
94 -no-feature-linkat \
90 -platform ${XPLATFORM} \ 95 -platform ${XPLATFORM} \
91" 96"
92 97
@@ -126,4 +131,4 @@ do_install() {
126 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 131 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
127} 132}
128 133
129SRCREV = "f27e029ef2e8400b803cec1b17ffd4e244d8610a" 134SRCREV = "36984dc8cec09703290692ce7e899e88754173c4"
diff --git a/recipes-qt/qt5/qtbase/0001-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0001-Bootstrap-without-linkat-feature.patch
new file mode 100644
index 00000000..32d8a4c7
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0001-Bootstrap-without-linkat-feature.patch
@@ -0,0 +1,27 @@
1From b15a9aa4f3229d01d3b12e0c4498bdcd55480a24 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 24 Nov 2017 15:16:31 +0200
4Subject: [PATCH] Bootstrap without linkat feature
5
6qmake does not work together with pseudo when unnamed temporary files
7are used with linkat.
8
9Upstream-Status: Inappropriate [OE specific]
10[YOCTO #11996]
11---
12 src/corelib/global/qconfig-bootstrapped.h | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
16index dabb715..5b4ff86 100644
17--- a/src/corelib/global/qconfig-bootstrapped.h
18+++ b/src/corelib/global/qconfig-bootstrapped.h
19@@ -88,7 +88,7 @@
20 #define QT_FEATURE_futimes -1
21 #define QT_FEATURE_library -1
22 #ifdef __linux__
23-# define QT_FEATURE_linkat 1
24+# define QT_FEATURE_linkat -1
25 #else
26 # define QT_FEATURE_linkat -1
27 #endif
diff --git a/recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch b/recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch
deleted file mode 100644
index 098e2fa7..00000000
--- a/recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch
+++ /dev/null
@@ -1,29 +0,0 @@
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 40c7c3da..45beca44 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -228,4 +228,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
228 228
229RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 229RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
230 230
231SRCREV = "f27e029ef2e8400b803cec1b17ffd4e244d8610a" 231SRCREV = "36984dc8cec09703290692ce7e899e88754173c4"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index 55104c4c..2c891aaa 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 = "3b24ef25fa328bf993891e242c0c3ff677fafbcb" 13SRCREV = "8137223f6c489c2d1bb2317474c99c77245bd7ec"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 83ec4223..a416cef1 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "cd8716678cf0cf2c9678edf4531a76cc00c7f828" 11SRCREV = "6a9606270e6611c818bdab382a29051d4cd3b459"
12 12
13# The same issue as in qtbase: 13# The same issue as in qtbase:
14# http://errors.yoctoproject.org/Errors/Details/152641/ 14# http://errors.yoctoproject.org/Errors/Details/152641/
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 5099c444..3bf16a67 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 = "18af3226765b62312acc8f801cc531fde0d9822b" 22SRCREV = "bb9b8af08b1602c7c867969b236393b3ff3f7f18"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index d27f5a1b..1bd34112 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 = "6300ff26ae43683a6ab701fcf031be2ff45b30f0" 11SRCREV = "d2abb20082322167311cfe0c84afa822754b74ef"
diff --git a/recipes-qt/qt5/qtdeclarative/0001-QQmlTypeLoader-The-profiler-is-a-quintptr-0-if-QT_NO.patch b/recipes-qt/qt5/qtdeclarative/0001-QQmlTypeLoader-The-profiler-is-a-quintptr-0-if-QT_NO.patch
deleted file mode 100644
index 92a63a3c..00000000
--- a/recipes-qt/qt5/qtdeclarative/0001-QQmlTypeLoader-The-profiler-is-a-quintptr-0-if-QT_NO.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 330e96565b37e227162ab7ec6d4c6f3f56d2a1fe Mon Sep 17 00:00:00 2001
2From: Ulf Hermann <ulf.hermann@qt.io>
3Date: Mon, 25 Sep 2017 11:55:20 +0200
4Subject: [PATCH] QQmlTypeLoader: The profiler is a quintptr(0) if
5 QT_NO_QML_DEBUGGING
6
7This follows the pattern established in other places.
8
9Task-number: QTBUG-63392
10Change-Id: I11cd66d5552f751804dd0a9460b26bda546c1726
11Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
12Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
13Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
14---
15 src/qml/qml/qqmltypeloader_p.h | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
19index c214f0c..abc0df9 100644
20--- a/src/qml/qml/qqmltypeloader_p.h
21+++ b/src/qml/qml/qqmltypeloader_p.h
22@@ -322,8 +322,8 @@ public:
23 void invalidate();
24
25 #ifdef QT_NO_QML_DEBUGGER
26- QQmlProfiler *profiler() const { return nullptr; }
27- void setProfiler(QQmlProfiler *) {}
28+ quintptr profiler() const { return 0; }
29+ void setProfiler(quintptr) {}
30 #else
31 QQmlProfiler *profiler() const { return m_profiler.data(); }
32 void setProfiler(QQmlProfiler *profiler);
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index ef73f1f2..d4d6bcf1 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -14,8 +14,6 @@ LIC_FILES_CHKSUM = " \
14 14
15DEPENDS += "qtbase" 15DEPENDS += "qtbase"
16 16
17SRC_URI += "file://0001-QQmlTypeLoader-The-profiler-is-a-quintptr-0-if-QT_NO.patch"
18
19PACKAGECONFIG ??= "qtxmlpatterns" 17PACKAGECONFIG ??= "qtxmlpatterns"
20PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns" 18PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns"
21 19
@@ -32,6 +30,6 @@ do_install_append_class-nativesdk() {
32 30
33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
34 32
35SRCREV = "ff5c83087e94f340a8c5695998f2ea81e29da8ea" 33SRCREV = "19f54245d35ee5eb66b991274908f780b103e3b4"
36 34
37BBCLASSEXTEND =+ "native nativesdk" 35BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index e6d75c93..a59ccf72 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 = "ffa5a03da503c3cd00f960debf3f43b85958c874" 17SRCREV = "b505116ee456d7084d8f570e062b3031b77d79df"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 20b30c1c..8312851e 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
18# http://errors.yoctoproject.org/Errors/Build/44912/ 18# http://errors.yoctoproject.org/Errors/Build/44912/
19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
20 20
21SRCREV = "045174c411f89863165610c1f6135ef4bd3d0889" 21SRCREV = "5ca1c00b33b0e125ab60413aa0fb3c7b0f89d8f2"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index f02e57b8..4552d683 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 = "36fdeb50941e3e2b0c4cd1b3343c3e337534357d" 29SRCREV = "caa90acd43684dc382f1e4f01c8787e18653ef43"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 93b37f18..fce37b8b 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -29,7 +29,7 @@ SRC_URI += " \
29 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 29 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
30" 30"
31 31
32SRCREV_qtlocation = "2b230b0a10d898979e9d5193f4da2e408b397fe3" 32SRCREV_qtlocation = "919bbf503d69fd6be87f22ea58c15872d08f8580"
33SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead" 33SRCREV_qtlocation-mapboxgl = "572822c8ca15be190b43afbf7f91d132e988bf21"
34 34
35SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 35SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index e7d110c1..7718a0a7 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -35,4 +35,4 @@ SRC_URI += "\
35# http://errors.yoctoproject.org/Errors/Build/44914/ 35# http://errors.yoctoproject.org/Errors/Build/44914/
36LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 36LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
37 37
38SRCREV = "951393508a5068bd999c3225158cbb06872d881c" 38SRCREV = "eb952c900eef7d9dd9d1e2b24abc35aadb0f8a60"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index a34b0d02..4c383225 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 = "d811ebc6c6e83b33d765664328da5c8c6f518f66" 12SRCREV = "febebfb6f09f23b16ac96a5a09d2ceb5b67046e7"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index 5cff948f..85b84629 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -26,7 +26,4 @@ do_configure_prepend() {
26 26
27QT_MODULE_BRANCH = "dev" 27QT_MODULE_BRANCH = "dev"
28 28
29# one commit behind: 29SRCREV = "b2476dcd53f0dea1e9eb38df5add3a771d64c4a1"
30# 8a7b80eb Use QRandomGenerator instead of q?rand
31# because QRandomGenerator is only since Qt 5.10
32SRCREV = "9bf0edd9bd46ecb900bcdc3349d14869b87ab7de"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 2ce8b250..2cc63a7d 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtdeclarative" 11DEPENDS += "qtdeclarative"
12 12
13SRCREV = "7cbf3685565d7f62c9a01b090a4c1600b4abe220" 13SRCREV = "1265fef3b290665272d3aacd0ba5213c43bad89d"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 7bec39ac..5de157e0 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
29SRCREV = "f9c410f619c1019fc361e230df0e4d2a2259e8e9" 29SRCREV = "87859b2aecbecdab8fd001e3a52887980b0735e8"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index 7a539685..9d3135b2 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
24 24
25EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 25EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
26 26
27SRCREV = "a3e68cda27ff01ab8fab73978f3f09db21222a98" 27SRCREV = "e6eb6ab12daf76f3e716c0d51ceecdab61e39e48"
28 28
29BBCLASSEXTEND += "native nativesdk" 29BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index a3ba2774..5d323155 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -30,4 +30,4 @@ DEPENDS += "qtbase"
30# http://errors.yoctoproject.org/Errors/Build/44915/ 30# http://errors.yoctoproject.org/Errors/Build/44915/
31LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 31LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
32 32
33SRCREV = "3d44bf7ce2a45d461f1d74a3f1dbdff313845898" 33SRCREV = "0bb3f3017f72cbf8d6866b8baa1820ab3dd89316"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 8a190417..53bfcc39 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 = "3ba4176568867cb146c2b758cd39461367ad22d1" 13SRCREV = "bbf3be4679571edef60425c3fd12df9d3035001c"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9
16# 5.9.meta-qt5.2 16# 5.9.meta-qt5.2
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 4010a518..caa9a042 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 = "b2e6b77c0862aba5d9f9fc979db8f2d84e47a78a" 15SRCREV = "7ae7dc325648a007a72e74f2bd7784a90b4714af"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 0a28a960..e8b6da40 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 = "01df1b7a635b11c9d0985f9651cfa4ae3d037890" 14SRCREV = "f25ddea7b12beff8d4de863fec18ce698d726ffa"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 113f1e9c..e48d095b 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 = "07e1fc7bb93dc4c306d8e64f4cb88d42177cba2e" 18SRCREV = "c7d99464c65a5bde663a8ec4daf3d343d8e9b14b"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index c8f3aa2f..3d0a372c 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "dc9e39eb679946e82bf3b1a82f5c49737f9994b2" 16SRCREV = "984ba6977201f8fbd94d44a2b67519e1faf458cc"
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 0c6ce7e0..bc3e289f 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -30,4 +30,4 @@ do_install_append() {
30 30
31QT_MODULE_BRANCH = "dev" 31QT_MODULE_BRANCH = "dev"
32 32
33SRCREV = "9c204e05ae7fefe9525b30238b469b1bb65d2537" 33SRCREV = "ca54870ffdf262f072c082adf80d63c421dbd68f"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index dcb188dd..f630ebe1 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -31,7 +31,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
31 31
32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
33 33
34SRCREV = "9099c8934ebc042b38435eae293cd46e4fd9b883" 34SRCREV = "790d6c45153b84336b68cfa1344d5734425eb2c5"
35 35
36BBCLASSEXTEND = "native nativesdk" 36BBCLASSEXTEND = "native nativesdk"
37 37
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 70910c15..040dd717 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -111,4 +111,4 @@ FILES_${PN}-qt = " \
111 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ 111 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
112" 112"
113 113
114SRCREV = "4f744d427a5bfd698dcdad394666a72ccbb79a3c" 114SRCREV = "f4b0f1684a8e668ede23fafbff02c3910d775043"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index ce3908d4..2930bd5a 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -53,4 +53,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
53 53
54DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 54DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
55 55
56SRCREV = "27df0d34644ffc553972641abfd3406219c85391" 56SRCREV = "8546475dd5d6076a98b0700f1d70211c1395fc63"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 25191a02..e7ded388 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 = "04f6ff77ef0c8858629766e191ecc3d4ef056848" 40SRCREV = "1a457a9dc9c61a6c995dbe06d72267cb0412b3bc"
41 41
42# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 42# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9
43# 5.9.meta-qt5.2 43# 5.9.meta-qt5.2
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index c64f6157..4469761e 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 = "ba755c28ea0cd35cfa9d8c77ef7f2c61437ad25b" 15SRCREV = "acb01cb27b6c4aead84435ec7115fecd2a8db336"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 28951057..220f2597 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 = "71b5fc5dd10e9edce8db886f6c05b7950b3cca6e" 14SRCREV = "0e4b43383dd826b5927f6276033f52ede1fa7936"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 57abc40d..9c849499 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
19COMPATIBLE_MACHINE_armv7ve = "(.*)" 19COMPATIBLE_MACHINE_armv7ve = "(.*)"
20COMPATIBLE_MACHINE_aarch64 = "(.*)" 20COMPATIBLE_MACHINE_aarch64 = "(.*)"
21 21
22SRCREV = "7e71daf48c2ee3c3518cbfe6103d212772ccf414" 22SRCREV = "54ea23243ca84ec5f086abf6c2278a025758b6ce"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 2d4e4139..0646ef02 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 = "ec2c0f4db6350a304dcf901b9adbadc895864c14" 16SRCREV = "33e3fcc1fb1eb614f8b452296f2d4c4353c413c6"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 18a8963c..e44823a8 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = " \
18 18
19DEPENDS += "qtbase" 19DEPENDS += "qtbase"
20 20
21SRCREV = "9e26cfa167778f3d9444aedcb23c8476683b3785" 21SRCREV = "8b831bdb513b4f6b7567c171d09875b14214c5c4"
22 22
23BBCLASSEXTEND =+ "native nativesdk" 23BBCLASSEXTEND =+ "native nativesdk"
24 24