diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-09-02 20:25:37 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-09-19 07:44:27 +0300 |
| commit | a16976979e929618c8fc873b798d78fc82393cab (patch) | |
| tree | f6881ce7c9119c3b1b3bce75577e2eddd0fa1c45 /recipes-qt/qt5/qtquick3d_git.bb | |
| parent | ab2d92123df243c5668904bb693309a0ecbb2a3c (diff) | |
qt5: update submodules
Update to latest content in Qt 5.14.0 branch.
Task-number: QTBUG-77876
Change-Id: I3ab35758a7e84bd15d50bcf794a9a3fd1fdaea3e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtquick3d_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtquick3d_git.bb | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index b63c889f..6c0065ac 100644 --- a/recipes-qt/qt5/qtquick3d_git.bb +++ b/recipes-qt/qt5/qtquick3d_git.bb @@ -8,8 +8,20 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtquickcontrols2" +SRC_URI += " \ + git://github.com/assimp/assimp.git;name=assimp;branch=master;protocol=https;destsuffix=git/src/3rdparty/assimp/src \ +" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[system-assimp] = "-system-assimp,-qt-assimp,assimp" + +EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" + FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ " -SRCREV = "03dbcc5eb3364886ee8ffc07b4438eaee3c188fe" +SRCREV_qtquick3d = "fa5d0b457c5e31cea5a1bddad574d4505c93174f" +SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9" + +SRCREV_FORMAT = "qtquick3d_assimp" |