diff options
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5-git.inc | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5-lts.inc | 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/qtdeclarative_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 0449d978..7a719228 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 = "d76b11a0d55f40e964686564bac512e5895147b6" | 198 | SRCREV = "69b8ab23c93785dc69ae43ea04d5620656a4af44" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 09057f7c..a08b06b7 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 | ||
4 | QT_MODULE ?= "${BPN}" | 4 | QT_MODULE ?= "${BPN}" |
5 | QT_MODULE_BRANCH ?= "5.15" | 5 | QT_MODULE_BRANCH ?= "5.15.4" |
6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" | 6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" |
7 | QT_MODULE_REPO ?= "${QT_MODULE}.git" | 7 | QT_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..ef66f85c 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}" | |||
4 | QT_GIT = "${QT_LTS_GIT}" | 4 | QT_GIT = "${QT_LTS_GIT}" |
5 | QT_LTS_GIT_PROTOCOL ?= "ssh" | 5 | QT_LTS_GIT_PROTOCOL ?= "ssh" |
6 | QT_GIT_PROTOCOL = "${QT_LTS_GIT_PROTOCOL}" | 6 | QT_GIT_PROTOCOL = "${QT_LTS_GIT_PROTOCOL}" |
7 | QT_MODULE_BRANCH = "tqtc/lts-5.15" | 7 | QT_MODULE_BRANCH = "tqtc/lts-5.15.4" |
8 | QT_LTS_MODULE_REPO ?= "tqtc-${QT_MODULE}.git" | 8 | QT_LTS_MODULE_REPO ?= "tqtc-${QT_MODULE}.git" |
9 | QT_MODULE_REPO = "${QT_LTS_MODULE_REPO}" | 9 | QT_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 292b9664..5927aae2 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 = "d76b11a0d55f40e964686564bac512e5895147b6" | 145 | SRCREV = "69b8ab23c93785dc69ae43ea04d5620656a4af44" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index ba064243..83c8b3a9 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 = "d76b11a0d55f40e964686564bac512e5895147b6" | 305 | SRCREV = "69b8ab23c93785dc69ae43ea04d5620656a4af44" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index ed08ec80..6118ba99 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 = "e5d149d9839516c371aea6da36fda98663e137f0" | 35 | SRCREV = "1089f8f226d546aef3b032a2f4391e08a3afa48d" |
36 | 36 | ||
37 | BBCLASSEXTEND =+ "native nativesdk" | 37 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 451de09f..f40ca3d3 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 = "b5834447f319a43d1bf143c9d2d96d6fcb6dbea9" | 197 | SRCREV_qtwebengine = "0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c" |
198 | SRCREV_chromium = "6764c29f7c5aaf9ecbe6532f9e2b845604c926a5" | 198 | SRCREV_chromium = "3f594ea1afb8b18c864715a796ef21099d432a13" |
199 | SRCREV = "${SRCREV_qtwebengine}" | 199 | SRCREV = "${SRCREV_qtwebengine}" |
200 | 200 | ||
201 | SRCREV_FORMAT = "qtwebengine_chromium" | 201 | SRCREV_FORMAT = "qtwebengine_chromium" |