diff options
author | Jani Suonpera <jani.suonpera@qt.io> | 2021-02-16 15:02:40 +0200 |
---|---|---|
committer | Jani Suonpera <jani.suonpera@qt.io> | 2021-02-17 10:48:08 +0200 |
commit | 1bb4485306dacaad7ac352111bc9ac9217fd099b (patch) | |
tree | 5c094fbc06c745b0d7596d7556aefb6b8a8e1a17 | |
parent | 0078f540970085b5258b64fb42915d4e0183975f (diff) | |
download | meta-qt5-1bb4485306dacaad7ac352111bc9ac9217fd099b.tar.gz |
qt5: update submodules for LTS 5.15
Task-number: QTBUG-91153
Change-Id: I5bab0bdca2df02e804878468646a48b9f02fda7e
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/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/qtdeclarative_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 4 |
8 files changed, 9 insertions, 9 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 9bb37fd9..4bc90e74 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -195,4 +195,4 @@ fakeroot do_generate_qt_environment_file() { | |||
195 | do_generate_qt_environment_file[umask] = "022" | 195 | do_generate_qt_environment_file[umask] = "022" |
196 | addtask generate_qt_environment_file after do_install before do_package | 196 | addtask generate_qt_environment_file after do_install before do_package |
197 | 197 | ||
198 | SRCREV = "bd75dd929c89b4d2b3257c26786330dc1507a478" | 198 | SRCREV = "db2ed3fdc8f3a1e70cb5ac962f469217e9df4190" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index e421c77f..4e54cf65 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 = "bd75dd929c89b4d2b3257c26786330dc1507a478" | 145 | SRCREV = "db2ed3fdc8f3a1e70cb5ac962f469217e9df4190" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 93f36d44..e97b4d7c 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -302,4 +302,4 @@ sed -i \ | |||
302 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri | 302 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri |
303 | } | 303 | } |
304 | 304 | ||
305 | SRCREV = "bd75dd929c89b4d2b3257c26786330dc1507a478" | 305 | SRCREV = "db2ed3fdc8f3a1e70cb5ac962f469217e9df4190" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 51dc2c7f..9052aa26 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 = "0db3b38521e11147cb802798a2cb7811a96029a9" | 22 | SRCREV = "e61994ab9d82470fe15f4476eecf2aef1d570f35" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index dcc85e55..cd7cd14c 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 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 32 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
33 | } | 33 | } |
34 | 34 | ||
35 | SRCREV = "b4e57491311ccbcc9da09a5d04e1fc6cec397a41" | 35 | SRCREV = "be794a433489b2d580abbfb8f54cc2a26a5aa92b" |
36 | 36 | ||
37 | BBCLASSEXTEND =+ "native nativesdk" | 37 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index fdea001f..13cf2727 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -35,7 +35,7 @@ SRC_URI += " \ | |||
35 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 35 | ${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 | " | 36 | " |
37 | 37 | ||
38 | SRCREV_qtlocation = "a924cd38a71af86023e0a9ea19d3379136b68c7f" | 38 | SRCREV_qtlocation = "6b1dc419f9cf32ee8ec739f4f12f44b1addca2d9" |
39 | SRCREV_qtlocation-mapboxgl = "d3101bbc22edd41c9036ea487d4a71eabd97823d" | 39 | SRCREV_qtlocation-mapboxgl = "d3101bbc22edd41c9036ea487d4a71eabd97823d" |
40 | 40 | ||
41 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 41 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 0b09fea0..3f290ba3 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -38,7 +38,7 @@ SRC_URI += "\ | |||
38 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 38 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
39 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 39 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
40 | 40 | ||
41 | SRCREV = "80d46e3a5f64ff2456c40bdba63b6d5c69a32cdd" | 41 | SRCREV = "5524add94f7a5fb43c572adcff9469230b5f1c61" |
42 | 42 | ||
43 | # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory | 43 | # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory |
44 | do_install_append() { | 44 | do_install_append() { |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index ee405dba..371bac57 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -194,8 +194,8 @@ SRC_URI_append_libc-musl = "\ | |||
194 | file://chromium/0025-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ | 194 | file://chromium/0025-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ |
195 | " | 195 | " |
196 | 196 | ||
197 | SRCREV_qtwebengine = "9651da8fdedb3533c5f95fa7a8028a017e508d07" | 197 | SRCREV_qtwebengine = "4c94370394ccf1e00233669df01599cb6141a5dc" |
198 | SRCREV_chromium = "471e102ba11517b5e5a3a996c621b2006e41070b" | 198 | SRCREV_chromium = "a38752bff0fd3ae3e98ce973a437413e074403a0" |
199 | SRCREV = "${SRCREV_qtwebengine}" | 199 | SRCREV = "${SRCREV_qtwebengine}" |
200 | 200 | ||
201 | SRCREV_FORMAT = "qtwebengine_chromium" | 201 | SRCREV_FORMAT = "qtwebengine_chromium" |