diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-17 23:32:56 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-18 23:04:41 +0000 |
commit | e2707a016c3475c167a421c9c73d88f81cc61bd1 (patch) | |
tree | e4bae2a878e4c97496dcd536af717f093c9579f2 /recipes-qt/qt5/qttools_git.bb | |
parent | 07784245c1822766d54405d835ac2dc08652df1a (diff) |
qt5: upgrade to 5.12.3
* be aware that in 3 qt* project the v5.12.3 tag wasn't created yet:
qtknx_git.bb:# v5.12.3 tag wasn't created yet
qtmqtt_git.bb:# v5.12.3 tag wasn't created yet
qtopcua_git.bb:# v5.12.3 tag wasn't created yet
* and qttools, qt3d, qtremoteobjects v5.12.3 tag isn't in 5.12 branch
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 be967149..0ac8a76f 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.12 -# 5.12.meta-qt5.1 +# 5.12.meta-qt5.2 SRC_URI += " \ file://0001-add-noqtwebkit-configuration.patch \ file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ @@ -32,7 +32,10 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "b0147a5d79ce7a7e77a24f36aaddfacb1a1517c8" +# Use 50335cb26bb88930f5e2a204642439cc9a4d2282 instead of +# 1f8d498752fed0b2b92d6a619aa11524dd771998 because the v5.12.3 tag wasn't +# merged to 5.12 branch yet +SRCREV = "50335cb26bb88930f5e2a204642439cc9a4d2282" BBCLASSEXTEND = "native nativesdk" |