diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-19 11:27:38 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-22 06:47:41 +0000 |
commit | f6373503a015b3a5b4f797c286dfc07e660cc20b (patch) | |
tree | 86d689c7c177316e28fe194f187f1a8464bf8a78 /recipes-qt/qt5/qttools_git.bb | |
parent | 5b7563e30c20156d4c6247ad259c28c17d621cb2 (diff) |
qt5: upgrade to 5.9.8
* unfortunatelly most of the modules don't have the v5.9.8 tags
merged to 5.9 branch yet, the only exception are:
qtnetworkauth, qtremoteobjects, qttranslations
* in most cases it means that we're missing just changes files, but
in some cases there are also some functional commits which are
missing in 5.9 SRCREV:
qtdeclarative:
9d6d2ee21 Use Los Angeles to represent PST8PDT, not Vancouver
qtimageformats:
11a7040 Update bundled libtiff to version 4.0.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.bb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 9d4b7311..ae30c945 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtxmlpatterns" # Patches from https://github.com/meta-qt5/qttools/commits/b5.9 -# 5.9.meta-qt5.7 +# 5.9.meta-qt5.8 SRC_URI += " \ file://0001-add-noqtwebkit-configuration.patch \ file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ @@ -29,7 +29,10 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -SRCREV = "961d99bb82f042c410ed826bfd39f8edb5d79bf0" +# Use e8d9ac8ab166d2e740a0df480277397d3b8a1283 +# instead of cb4fb7bdd59bb57324893cf1b226f380d03b574f because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "e8d9ac8ab166d2e740a0df480277397d3b8a1283" BBCLASSEXTEND = "native nativesdk" |