aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtquick3d_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtquick3d_git.bb')
-rw-r--r--recipes-qt/qt5/qtquick3d_git.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
index a69113ab..9349e098 100644
--- a/recipes-qt/qt5/qtquick3d_git.bb
+++ b/recipes-qt/qt5/qtquick3d_git.bb
@@ -1,7 +1,7 @@
require qt5.inc
require qt5-lts.inc
-LICENSE = "(GPL-3.0 & BSD) | The-Qt-Company-Commercial"
+LICENSE = "(GPL-3.0-only & BSD-3-Clause) | The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
"
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
SRC_URI += " \
- git://github.com/assimp/assimp.git;name=assimp;branch=assimp_5.0_release;protocol=https;destsuffix=git/src/3rdparty/assimp/src \
+ git://code.qt.io/qt/qtquick3d-assimp.git;name=assimp;branch=qt6_assimp;protocol=https;destsuffix=git/src/3rdparty/assimp/src \
"
PACKAGECONFIG ??= ""
@@ -17,11 +17,11 @@ PACKAGECONFIG[system-assimp] = "-system-quick3d-assimp,-qt-quick3d-assimp,assimp
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
-FILES_${PN}-qmlplugins += " \
+FILES:${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
"
-SRCREV_qtquick3d = "4e6ad9873dde3659a273d78cfa6d677bca5897ef"
+SRCREV_qtquick3d = "d3272d49a0a01714bc486e0fd39ae2bbfe7a74c6"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
SRCREV_FORMAT = "qtquick3d_assimp"