diff options
author | Dan Ackers <dan.ackers@qt.io> | 2021-05-11 10:26:01 +0300 |
---|---|---|
committer | Dan Ackers <dan.ackers@qt.io> | 2021-05-19 10:49:57 +0300 |
commit | bbad5a0a1981afd11489489ce668c60b41f39d25 (patch) | |
tree | f00880a137a02fcc96404cc087314b8df4f7c656 | |
parent | c376fd12845045d6b9b937e355d36ed27afc8576 (diff) | |
download | meta-qt5-bbad5a0a1981afd11489489ce668c60b41f39d25.tar.gz |
Update to latest content in Qt 5.12.11 branch.
Change-Id: Ie21df22aa999d3425407db0ba6e05c32711f4bb1
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/qtwebengine_git.bb | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 2ebd33f0..0e6eabaf 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 = "8edba37d549f9cf9320677006d0786fc230bb315" | 197 | SRCREV = "4341f6763b8a737ebc07bb78ead22bc05a1a515b" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 4f4b6477..9705a5ab 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 = "8edba37d549f9cf9320677006d0786fc230bb315" | 145 | SRCREV = "4341f6763b8a737ebc07bb78ead22bc05a1a515b" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 30b64831..80bfebc2 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 = "8edba37d549f9cf9320677006d0786fc230bb315" | 279 | SRCREV = "4341f6763b8a737ebc07bb78ead22bc05a1a515b" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index e9cdc13c..575df87d 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 = "67194333916289ae7dd3ece6b0e2131f665c1916" | 179 | SRCREV_qtwebengine = "9dfb4348feb612ea6405428c3c64f48328083e94" |
180 | SRCREV_chromium = "4e224e5af48f9268d8f72b0f8adf4e9a1a470ca6" | 180 | SRCREV_chromium = "bda00397362bf03ff7b8d88fa54625524f604c7e" |
181 | SRCREV = "${SRCREV_qtwebengine}" | 181 | SRCREV = "${SRCREV_qtwebengine}" |
182 | 182 | ||
183 | SRCREV_FORMAT = "qtwebengine_chromium" | 183 | SRCREV_FORMAT = "qtwebengine_chromium" |