summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Suonpera <jani.suonpera@qt.io>2021-06-03 12:05:42 +0300
committerJani Suonpera <jani.suonpera@qt.io>2021-06-03 13:41:37 +0300
commit5ffe29fa9ea97b3fcf59c511ea03e23dbfa15fb7 (patch)
treeecebf9f856159d0ab0168911cdb94489cc1ebb24
parente9a05fc01a17b0cab6ccb2f39715e589313f5a24 (diff)
downloadmeta-qt5-5ffe29fa9ea97b3fcf59c511ea03e23dbfa15fb7.tar.gz
qt5: update submodules for LTS 5.15.5
Task-number: QTBUG-93792 Change-Id: Ibb8dba605fdd9a7c378d861ff88a102645441dcc Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qt5-lts.inc2
-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/qtwebengine_git.bb4
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 4ac8b77f..dfce31c3 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 = "2e9cd7443f1a281b1dbc62c73060ff3c5889d300" 198SRCREV = "c6803b0ef71278e68c371158db368d59ab198bc1"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 77d2b02b..65ed65d9 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
2# Copyright (C) 2013-2020 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2020 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.15" 5QT_MODULE_BRANCH ?= "5.15.5"
6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" 6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
7QT_MODULE_REPO ?= "${QT_MODULE}.git" 7QT_MODULE_REPO ?= "${QT_MODULE}.git"
8 8
diff --git a/recipes-qt/qt5/qt5-lts.inc b/recipes-qt/qt5/qt5-lts.inc
index 0a5a3abe..9ff461aa 100644
--- a/recipes-qt/qt5/qt5-lts.inc
+++ b/recipes-qt/qt5/qt5-lts.inc
@@ -4,7 +4,7 @@ QT_LTS_GIT ?= "git://codereview.qt-project.org/${QT_GIT_PROJECT}"
4QT_GIT = "${QT_LTS_GIT}" 4QT_GIT = "${QT_LTS_GIT}"
5QT_LTS_GIT_PROTOCOL ?= "ssh" 5QT_LTS_GIT_PROTOCOL ?= "ssh"
6QT_GIT_PROTOCOL = "${QT_LTS_GIT_PROTOCOL}" 6QT_GIT_PROTOCOL = "${QT_LTS_GIT_PROTOCOL}"
7QT_MODULE_BRANCH = "tqtc/lts-5.15" 7QT_MODULE_BRANCH = "tqtc/lts-5.15.5"
8QT_LTS_MODULE_REPO ?= "tqtc-${QT_MODULE}.git" 8QT_LTS_MODULE_REPO ?= "tqtc-${QT_MODULE}.git"
9QT_MODULE_REPO = "${QT_LTS_MODULE_REPO}" 9QT_MODULE_REPO = "${QT_LTS_MODULE_REPO}"
10 10
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 09f68208..711ef530 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 = "2e9cd7443f1a281b1dbc62c73060ff3c5889d300" 145SRCREV = "c6803b0ef71278e68c371158db368d59ab198bc1"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index eff14c68..1ffb515d 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 = "2e9cd7443f1a281b1dbc62c73060ff3c5889d300" 305SRCREV = "c6803b0ef71278e68c371158db368d59ab198bc1"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 50d516f4..e2b98d8e 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 = "36f75c0a1b0145b50f24db397a641c1760cb351a" 35SRCREV = "53086eaf2ffb5fc1c360cf13f3d87e8d5f2a7b6f"
36 36
37BBCLASSEXTEND =+ "native nativesdk" 37BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 03406171..addb4db5 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 = "2240a3f8ebcd317e11fac446aec14bc004067cd9" 197SRCREV_qtwebengine = "09bf7d7a9fc92c3c8bb5cd4b5094e330d9adf8ad"
198SRCREV_chromium = "dc35950b9eed3be05c4dc747720f495148ffe14b" 198SRCREV_chromium = "eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b"
199SRCREV = "${SRCREV_qtwebengine}" 199SRCREV = "${SRCREV_qtwebengine}"
200 200
201SRCREV_FORMAT = "qtwebengine_chromium" 201SRCREV_FORMAT = "qtwebengine_chromium"