diff options
author | Lassi Lehikoinen <lassi.lehikoinen@qt.io> | 2020-10-29 15:25:31 +0200 |
---|---|---|
committer | Lassi Lehikoinen <lassi.lehikoinen@qt.io> | 2020-10-29 15:30:17 +0200 |
commit | 108a92a9a8ebe8a2a702ac7de2214bc3d11f19a3 (patch) | |
tree | e462c2e15970aa0d5f6523987e730858fbdeaea8 | |
parent | 7d6de40a483c5c28bfa675f4d4577a6d9503ba56 (diff) | |
download | meta-qt5-108a92a9a8ebe8a2a702ac7de2214bc3d11f19a3.tar.gz |
qt5: update submodules
Update to latest content in Qt 5.12.10 branch.
Task-number: QTBUG-86653
Change-Id: Id6f1e4b6e012697fcc9e8348b29a94f20898d19e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_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/qtconnectivity_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtgamepad_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtknx_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtmqtt_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtopcua_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols2_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtscxml_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtsensors_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtsvg_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 | ||||
-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 | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qtxmlpatterns_git.bb | 2 |
20 files changed, 21 insertions, 21 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 464e79d6..f1d008a4 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -194,4 +194,4 @@ fakeroot do_generate_qt_environment_file() { | |||
194 | do_generate_qt_environment_file[umask] = "022" | 194 | do_generate_qt_environment_file[umask] = "022" |
195 | addtask generate_qt_environment_file after do_install before do_package | 195 | addtask generate_qt_environment_file after do_install before do_package |
196 | 196 | ||
197 | SRCREV = "154a7234e83ce69f886aaf502ed1943574d30e06" | 197 | SRCREV = "d43c6f1bada49b8c0a90feb96a7b8297f9f1ab05" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 1712e7da..973f25db 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -142,4 +142,4 @@ do_install() { | |||
142 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 142 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
143 | } | 143 | } |
144 | 144 | ||
145 | SRCREV = "154a7234e83ce69f886aaf502ed1943574d30e06" | 145 | SRCREV = "d43c6f1bada49b8c0a90feb96a7b8297f9f1ab05" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 1f3eb477..d580f663 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -276,4 +276,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
276 | 276 | ||
277 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 277 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
278 | 278 | ||
279 | SRCREV = "154a7234e83ce69f886aaf502ed1943574d30e06" | 279 | SRCREV = "d43c6f1bada49b8c0a90feb96a7b8297f9f1ab05" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index abb45362..52404095 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,bluez5" | |||
19 | 19 | ||
20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
21 | 21 | ||
22 | SRCREV = "582f841a8be0a4437d55d70c8fad4b504bb1b228" | 22 | SRCREV = "568c411f2751a97e9cc39f58adfa16f2465c4bae" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 831d4bf0..40e39cec 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 = "6f22f05ebb2c555a9ed65b18faa9af2c195ceecd" | 17 | SRCREV = "93b710ebc59a5fac6f9f657c5afe8770bf7506ab" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 9dffd4a4..fcdbce65 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "167ff2c96ab0ac7288af85b765fbbb0215b346d6" | 12 | SRCREV = "1e3510bf14942bd1b1134a52700e0ca06cbbf5d8" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 87920bec..163202ee 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -36,7 +36,7 @@ SRC_URI += " \ | |||
36 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 36 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
37 | " | 37 | " |
38 | 38 | ||
39 | SRCREV_qtlocation = "f1779847ad313d1b98b61c0565c0c95aa3961091" | 39 | SRCREV_qtlocation = "3c7489c3802a11bf62b7f851fb088f9671b76262" |
40 | SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" | 40 | SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" |
41 | 41 | ||
42 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 42 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index f0d7618e..2d1931dd 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "2bbc2b36043d8fd62d012d2a0deab97358235f45" | 12 | SRCREV = "91d59b6e103cb5b910d310cb32938a7e9235dddb" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index f32cc711..a6116bae 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -37,4 +37,4 @@ SRC_URI += "\ | |||
37 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 37 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
39 | 39 | ||
40 | SRCREV = "c0bd851e6e89723db36f2b69dc2d00ed385c67e1" | 40 | SRCREV = "67ab370d6a87d3b44e1cc4efb0f3fc57d5ac751e" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 813c21b8..55bcbdab 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb | |||
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" | |||
18 | 18 | ||
19 | DEPENDS += "qtbase" | 19 | DEPENDS += "qtbase" |
20 | 20 | ||
21 | SRCREV = "c58d38d030c7c64c838421a9c734d332ee19a273" | 21 | SRCREV = "a718a44c796b8805fc208035cd743de1efd7e7d4" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index aa8136ea..55907713 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 qtdeclarative-native" | 11 | DEPENDS += "qtdeclarative qtdeclarative-native" |
12 | 12 | ||
13 | SRCREV = "8344385307605dd9956f9e30bc92603aa2b19872" | 13 | SRCREV = "63f73a2aee40f9bec5ef63fdd416877a6737110d" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index b0d475e2..70e7d820 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ | |||
17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ | 17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "89261d2b5486d065f4167b793ea6b76c63a7eeda" | 20 | SRCREV = "8c37f9ee025057ab27f9a8c92e8d3e2b585ebf6c" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 47d70377..f9793f38 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 = "206a812b21d9ade4a9319256ff5fce6930f18e27" | 13 | SRCREV = "878112bf670bb9f9caa09de290c63b0f9078d3f0" |
14 | 14 | ||
15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 | 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 |
16 | # 5.12.meta-qt5.2 | 16 | # 5.12.meta-qt5.2 |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 29b33731..42fcf55f 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase qtdeclarative" | 13 | DEPENDS += "qtbase qtdeclarative" |
14 | 14 | ||
15 | SRCREV = "e749e4b965ddba7781a3f5497c80d51e345793e4" | 15 | SRCREV = "903ed99bcc92417cd76d79ac598daf5f299b80cd" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 2332cf7b..e3dbca43 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "4491fd66db8e36204f6d36d0002897afd119bc80" | 15 | SRCREV = "261ed79b966065f4ce398f1a701be6298dd49be9" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 84146943..f98d13ba 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ | |||
32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ | 32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ |
33 | " | 33 | " |
34 | 34 | ||
35 | SRCREV = "6d15540d6fdc3a45526a780e4a836c921493c19c" | 35 | SRCREV = "1d665e7f4ac2a426e702c2935f11aa160e27bddb" |
36 | 36 | ||
37 | BBCLASSEXTEND = "native nativesdk" | 37 | BBCLASSEXTEND = "native nativesdk" |
38 | 38 | ||
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 4a5515a3..883952f9 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" | |||
71 | 71 | ||
72 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" | 72 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" |
73 | 73 | ||
74 | SRCREV = "c911cfd16126099a571af687183b7f6d25ba6063" | 74 | SRCREV = "bb9fd3b992d716ebba392bc3cf21da41e5562d08" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index cbecd64b..a0cda175 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris | |||
37 | 37 | ||
38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
39 | 39 | ||
40 | SRCREV = "64650aa3776ee798aab27a03ffcbe225cd6d58be" | 40 | SRCREV = "971ed94adbf538af5a09e4136921fc0e8cee9815" |
41 | 41 | ||
42 | BBCLASSEXTEND =+ "native nativesdk" | 42 | BBCLASSEXTEND =+ "native nativesdk" |
43 | 43 | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index c00a0b2f..148bbdbd 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -176,8 +176,8 @@ SRC_URI_append_libc-musl = "\ | |||
176 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 176 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
177 | " | 177 | " |
178 | 178 | ||
179 | SRCREV_qtwebengine = "eac0b7e9fc3e0fad609a86f418358f1d56bf2a87" | 179 | SRCREV_qtwebengine = "07fcac049e7b362b703f31ec559f5097f804588e" |
180 | SRCREV_chromium = "1357b9be19ff1b5c97ec6bb67c0d44677f93c5bb" | 180 | SRCREV_chromium = "92253f4cc04b8fddd238e2fc9309d8c33c8bdc05" |
181 | SRCREV = "${SRCREV_qtwebengine}" | 181 | SRCREV = "${SRCREV_qtwebengine}" |
182 | 182 | ||
183 | SRCREV_FORMAT = "qtwebengine_chromium" | 183 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 0092f773..34d01abc 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -25,7 +25,7 @@ do_configure_prepend() { | |||
25 | 25 | ||
26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
27 | 27 | ||
28 | SRCREV = "05b1f5ef4a6600d8c460f206ca5e7ba3b8e4d24e" | 28 | SRCREV = "2e532e96db74bc666af800c2530827eea75a2107" |
29 | 29 | ||
30 | BBCLASSEXTEND =+ "native nativesdk" | 30 | BBCLASSEXTEND =+ "native nativesdk" |
31 | 31 | ||