aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qttools_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-05-27 15:22:21 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2020-05-27 15:54:32 +0200
commitb434031733b5fc0889ce89af669950f6b1cd9aa1 (patch)
tree8084e310049308bb58ab9a603508ca17c9b61c96 /recipes-qt/qt5/qttools_git.bb
parentcfcd40e3d01bd2db8ec9617c8117b91fe7c41c8d (diff)
qt5: upgrade to 5.15.0
* https://www.qt.io/blog/qt-5.15-released * continue to use latest revision in 5.15 (and 80-based) branch for qtwebengine, because we were already using newer than v5.15.0 revision and some of those fixes are needed for master (e.g. for build with gcc-10) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qttools_git.bb')
-rw-r--r--recipes-qt/qt5/qttools_git.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index ae2f94f6..913a0f8d 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = " \
"
DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
-# Patches from https://github.com/meta-qt5/qttools/commits/b5.14
-# 5.14.meta-qt5.1
+# Patches from https://github.com/meta-qt5/qttools/commits/b5.15
+# 5.15.meta-qt5.1
SRC_URI += " \
file://0001-add-noqtwebkit-configuration.patch \
file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \
@@ -49,6 +49,6 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\
${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \
"
-SRCREV = "87a862817ccdabb3f7c0e34a2b27c94663e3a1f8"
+SRCREV = "6a85b6150554111f7d473d56addfe5a8b5da4400"
BBCLASSEXTEND = "native nativesdk"