diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-22 14:51:05 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-20 10:06:37 +0000 |
commit | f33be06035faaa59cee17e5a97e82d079b4ab444 (patch) | |
tree | 79d1a995808932b7e9fae144e2b13ddb0b4908a2 /recipes-qt/qt5/qt3d_git.bb | |
parent | c7549747b6e83e9630ae37c7e2595e41e4f1ebac (diff) |
qt5: upgrade to 5.11 Alpha
* use qtwebkit and qtwebkit-examples from dev branch, because there is
no 5.11 branch (there isn't 5.10 as well, but because nobranch=1 in
qt5-git.inc nobody noticed).
* qtbase: drop qml-debug options
removed from qtbase in:
commit 525f8516c2580018f910cfb99ab5e0e36bd55ab1
Author: Ulf Hermann <ulf.hermann@qt.io>
Date: Fri Oct 6 16:27:09 2017 +0200
Subject: Remove qml-debug configure flag and feature
* qtgraphicaleffects, qtquickcontrols2, qtquickcontrols,
qtvirtualkeyboard: add qtdeclarative-native dependency
needed for qmlcachegen binary
* qtwebkit: update LIC_FILES_CHKSUM and remove PACKAGECONFIGs
referenced files disappered in:
commit 6882a04fb36642862b11efe514251d32070c3d65
Author: Konstantin Tokarev <annulen@yandex.ru>
Date: Thu Aug 25 19:20:41 2016 +0300
Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qt3d_git.bb')
-rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index dbd1b279..3cbdfa57 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" DEPENDS_class-target += "qtdeclarative qt3d-native" -# Patches from https://github.com/meta-qt5/qt3d/commits/b5.10 -# 5.10.meta-qt5.2 +# Patches from https://github.com/meta-qt5/qt3d/commits/b5.11 +# 5.11.meta-qt5.1 SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \ @@ -37,6 +37,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "31f424bb81cd2583920d3d521e1e01f01c2d28e2" +SRCREV = "e813fb36e782c5e0ab7c25b9c069cee709692506" BBCLASSEXTEND += "native nativesdk" |