diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-04-24 10:26:07 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-05-09 05:52:19 +0300 |
commit | db03213142de38997c95f53a5e731a92e9c48d2f (patch) | |
tree | 43176f11ca4a040b3292bcadeda888367f559a0e /recipes-qt/qt5/qt3d_git.bb | |
parent | 5d375076a9c2b2e39f99012d3519a1cb2ff5811d (diff) | |
parent | 7a52f924a0298857db99be20aca1484bb2b4e163 (diff) |
Merge remote-tracking branch 'qtyocto/upstream/rocko' into 5.9
* qtyocto/upstream/rocko:
7a52f92 packagegroup-qt5-toolchain-target/qttranslations: fix nothing provides qttranslations-qtconfig
f48752c qt5: upgrade to 5.9.5
4e7ba65 Change default SRC_URI from github.com to code.qt.io
bf68f8b layer.conf: add LAYERSERIES_COMPAT
5b71698 maliit-framework-qt5: refresh patches
32bb7d1 qt5-git.inc: drop nobranch=1
Conflicts:
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
Change-Id: Ibea502ea07d8b7e145c1fa55cf82d8b70435d983
Diffstat (limited to 'recipes-qt/qt5/qt3d_git.bb')
-rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 2f596844..d831578f 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -12,7 +12,7 @@ DEPENDS += "qtbase" DEPENDS_class-target += "qtdeclarative qt3d-native" # Patches from https://github.com/meta-qt5/qt3d/commits/b5.9 -# 5.9.meta-qt5.4 +# 5.9.meta-qt5.5 SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \ |