diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-02-05 09:30:19 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-02-11 21:43:43 +0200 |
| commit | 2f93925b83e0edf932e2451b159a486eaa9d4086 (patch) | |
| tree | 8482f68d1dbbb33ea69426b791622935fba95dc0 /recipes-qt/qt5/qtquick3d_git.bb | |
| parent | 99c9d1849766bdc1429a5d0a09eaf16ec1f1b065 (diff) | |
| download | meta-qt5-2f93925b83e0edf932e2451b159a486eaa9d4086.tar.gz | |
qt5: update submodules
Update to Qt 5.15.0 Alpha
Task-number: QTBUG-80823
Change-Id: Ibd13ad11d175e5d633715a731380244bd4b7dda6
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 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index f9f8a421..5ca466c1 100644 --- a/recipes-qt/qt5/qtquick3d_git.bb +++ b/recipes-qt/qt5/qtquick3d_git.bb | |||
| @@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = " \ | |||
| 7 | " | 7 | " |
| 8 | 8 | ||
| 9 | DEPENDS += "qtbase qtdeclarative qtquickcontrols2" | 9 | DEPENDS += "qtbase qtdeclarative qtquickcontrols2" |
| 10 | ASSIMP_BRANCH = "assimp_5.0_release" | ||
| 10 | 11 | ||
| 11 | SRC_URI += " \ | 12 | SRC_URI += " \ |
| 12 | git://github.com/assimp/assimp.git;name=assimp;branch=master;protocol=https;destsuffix=git/src/3rdparty/assimp/src \ | 13 | git://github.com/assimp/assimp.git;name=assimp;branch=${ASSIMP_BRANCH};protocol=https;destsuffix=git/src/3rdparty/assimp/src \ |
| 13 | " | 14 | " |
| 14 | 15 | ||
| 15 | PACKAGECONFIG ??= "" | 16 | PACKAGECONFIG ??= "" |
| @@ -21,7 +22,7 @@ FILES_${PN}-qmlplugins += " \ | |||
| 21 | ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ | 22 | ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ |
| 22 | " | 23 | " |
| 23 | 24 | ||
| 24 | SRCREV_qtquick3d = "a3a9d0dcb721f8b4bdabfc8504679f1e839c1b88" | 25 | SRCREV_qtquick3d = "4005e300d25e18bd0c3fae756ccf34b4b4f560f6" |
| 25 | SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9" | 26 | SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" |
| 26 | 27 | ||
| 27 | SRCREV_FORMAT = "qtquick3d_assimp" | 28 | SRCREV_FORMAT = "qtquick3d_assimp" |
