summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Suonpera <jani.suonpera@qt.io>2021-02-09 12:29:21 +0200
committerJani Suonpera <jani.suonpera@qt.io>2021-02-09 16:37:52 +0200
commitca6bf4021de017044be50162333fe9ec99a33fb8 (patch)
tree484e004fcd677457c098e4d5e0a862b9ed1c8762
parent5a29299dd08140856ec083711fcb32f164ca94a8 (diff)
downloadmeta-qt5-ca6bf4021de017044be50162333fe9ec99a33fb8.tar.gz
qt5: update submodules for LTS 5.15
Sync latest submodules. Task-number: QTBUG-90623 Change-Id: Ieeca71202a5bd62ef8327cec4cc48bae099a2597 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb4
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 9033b546..9bb37fd9 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() {
195do_generate_qt_environment_file[umask] = "022" 195do_generate_qt_environment_file[umask] = "022"
196addtask generate_qt_environment_file after do_install before do_package 196addtask generate_qt_environment_file after do_install before do_package
197 197
198SRCREV = "270729e48d5f644c0e1dc8c24efa228cfd83a68f" 198SRCREV = "bd75dd929c89b4d2b3257c26786330dc1507a478"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index b10c88b4..e421c77f 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
145SRCREV = "270729e48d5f644c0e1dc8c24efa228cfd83a68f" 145SRCREV = "bd75dd929c89b4d2b3257c26786330dc1507a478"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index d9db4aa6..93f36d44 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
305SRCREV = "270729e48d5f644c0e1dc8c24efa228cfd83a68f" 305SRCREV = "bd75dd929c89b4d2b3257c26786330dc1507a478"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 159bd0ef..dcc85e55 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
35SRCREV = "e655719687f339bef0bb2def577f73932367eb02" 35SRCREV = "b4e57491311ccbcc9da09a5d04e1fc6cec397a41"
36 36
37BBCLASSEXTEND =+ "native nativesdk" 37BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
index ac613cf9..c5991721 100644
--- a/recipes-qt/qt5/qtquick3d_git.bb
+++ b/recipes-qt/qt5/qtquick3d_git.bb
@@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \
21 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ 21 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
22" 22"
23 23
24SRCREV_qtquick3d = "c7ca1a4fe3fb4b1f6a689ed6b7d8c7dbbdebedd8" 24SRCREV_qtquick3d = "881f8e3f07b731bef73d11e373b417b3fcfb9723"
25SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" 25SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
26 26
27SRCREV_FORMAT = "qtquick3d_assimp" 27SRCREV_FORMAT = "qtquick3d_assimp"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 11b3b9ca..0cd28c09 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 qtdeclarative-native" 11DEPENDS += "qtdeclarative qtdeclarative-native"
12 12
13SRCREV = "7e819a5777a0632175347688312da9cee0702177" 13SRCREV = "d8ac047575781635e70768973a0080b19b735df4"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 21e5b55d..74622f2e 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -39,7 +39,7 @@ EXTRA_QMAKEVARS_PRE += " \
39 ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ 39 ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
40 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \ 40 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \
41" 41"
42SRCREV = "63bacb8f099b35a68d86a20a80e8ff5e33f86d5f" 42SRCREV = "bf7e066168af57eaaecc66fe983d92bcad3f2ce6"
43 43
44BBCLASSEXTEND = "native nativesdk" 44BBCLASSEXTEND = "native nativesdk"
45 45
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 62a41012..ee405dba 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
197SRCREV_qtwebengine = "7a9b2483f6e1476ad373df6733d96f17bbf103a6" 197SRCREV_qtwebengine = "9651da8fdedb3533c5f95fa7a8028a017e508d07"
198SRCREV_chromium = "3b1e8320c3e93dc41211ccd66cfd26fa7eec18c5" 198SRCREV_chromium = "471e102ba11517b5e5a3a996c621b2006e41070b"
199SRCREV = "${SRCREV_qtwebengine}" 199SRCREV = "${SRCREV_qtwebengine}"
200 200
201SRCREV_FORMAT = "qtwebengine_chromium" 201SRCREV_FORMAT = "qtwebengine_chromium"