diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2021-03-29 12:44:42 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2021-04-01 10:21:36 +0300 |
| commit | 8f5b3c0138efe2bf103826198ca841bc2f9c01d9 (patch) | |
| tree | b7d303d498062c28a59cb7795e7ee082dbcda25e | |
| parent | 3a6824dfbd06d954d861dace01ecb293cd9098ea (diff) | |
| download | meta-qt5-8f5b3c0138efe2bf103826198ca841bc2f9c01d9.tar.gz | |
qt5: update submodules for LTS 5.15.4
Update to latest content in lts-5.15 branch.
Task-number: QTBUG-91987
Change-Id: I7f58aab58a22b08fb8f230c48b39a61cd822c91b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@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/qtwayland_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 4 |
7 files changed, 8 insertions, 8 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index e95bcb5c..ae591964 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 = "dde0c0a45c3a2b2835b5ae165dc8c04d8e1dd604" | 198 | SRCREV = "25c0017ddfb7136038f9c56393803a898c1d3d1e" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 2856accc..cfe96c00 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 = "dde0c0a45c3a2b2835b5ae165dc8c04d8e1dd604" | 145 | SRCREV = "25c0017ddfb7136038f9c56393803a898c1d3d1e" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 7ffa6354..6dbb3357 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 = "dde0c0a45c3a2b2835b5ae165dc8c04d8e1dd604" | 305 | SRCREV = "25c0017ddfb7136038f9c56393803a898c1d3d1e" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 58529c21..25d2d466 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 = "1b07519f6ca912c0c6334b96d26c61fd8b216a6e" | 22 | SRCREV = "5466df6f9b9237caba71a3ae323b931de1f7eda9" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 43896674..772ab8aa 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 = "c2b72da5764adfabc446ce339cb173c03af2fc0d" | 35 | SRCREV = "de3dfe2411180c2a4754f22a1a61b19a25099a2c" |
| 36 | 36 | ||
| 37 | BBCLASSEXTEND =+ "native nativesdk" | 37 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index da3fb534..09b0dabb 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
| @@ -43,7 +43,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu | |||
| 43 | 43 | ||
| 44 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 44 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
| 45 | 45 | ||
| 46 | SRCREV = "c6880513f315e00bbd7cfabbc4c3260f46c5da78" | 46 | SRCREV = "560d8a3bb8853c3d5a20d23aec77ee00ba71b718" |
| 47 | 47 | ||
| 48 | BBCLASSEXTEND =+ "native nativesdk" | 48 | BBCLASSEXTEND =+ "native nativesdk" |
| 49 | 49 | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 6f21a755..d666b63e 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 = "2ad08a9e97b181d461f472f831160ca963b49f9b" | 197 | SRCREV_qtwebengine = "fb71d8bb879cbc5e74a3183550f31269e4f9f865" |
| 198 | SRCREV_chromium = "302379ca3cbc383aed9bea48c5ae83475ab60e05" | 198 | SRCREV_chromium = "6ec3297a5aafc0b315e9b5ba25bcdc19e90304db" |
| 199 | SRCREV = "${SRCREV_qtwebengine}" | 199 | SRCREV = "${SRCREV_qtwebengine}" |
| 200 | 200 | ||
| 201 | SRCREV_FORMAT = "qtwebengine_chromium" | 201 | SRCREV_FORMAT = "qtwebengine_chromium" |
