aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt3d_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2019-04-17 23:32:56 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2019-04-18 23:04:41 +0000
commite2707a016c3475c167a421c9c73d88f81cc61bd1 (patch)
treee4bae2a878e4c97496dcd536af717f093c9579f2 /recipes-qt/qt5/qt3d_git.bb
parent07784245c1822766d54405d835ac2dc08652df1a (diff)
qt5: upgrade to 5.12.3
* be aware that in 3 qt* project the v5.12.3 tag wasn't created yet: qtknx_git.bb:# v5.12.3 tag wasn't created yet qtmqtt_git.bb:# v5.12.3 tag wasn't created yet qtopcua_git.bb:# v5.12.3 tag wasn't created yet * and qttools, qt3d, qtremoteobjects v5.12.3 tag isn't in 5.12 branch 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.bb7
1 files changed, 5 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index a3b62f8d..7c1d7fea 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.12
-# 5.12.meta-qt5.1
+# 5.12.meta-qt5.2
SRC_URI += " \
file://0001-Allow-a-tools-only-build.patch \
"
@@ -36,6 +36,9 @@ do_configure_prepend() {
${S}/src/quick3d/imports/input/importsinput.pro
}
-SRCREV = "3de900a10c6fd051ba54727be2fd1fe47ed10481"
+# Use e84d8d2a81eb81f9b1ea9f40d4da36d09a97b246 instead of
+# 7da5c4c35a657ea43663b4ed0d65e896b8db5c69 because the v5.12.3 tag wasn't
+# merged to 5.12 branch yet
+SRCREV = "e84d8d2a81eb81f9b1ea9f40d4da36d09a97b246"
BBCLASSEXTEND += "native nativesdk"