aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-02-04 12:59:53 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-02-06 11:47:28 +0200
commitcc7ea9d938a657ac6e510fff93f6849dacffcf09 (patch)
tree8ea4d8d63900a24b58fdc28c5c8b309e2165d243
parent032b369c5a7f2311844c58bfb5e6736607d83e52 (diff)
ogl-runtime: update to v2.6.0
(cherry-picked from commit 791c85207919ccbaea78d43101446e8ada73d2a0) Fixes: QT3DS-4054 Change-Id: Id259c854074d79f49b1d0dd816ea4b8cf7cacbec Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/qt5/ogl-runtime_git.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb
index 8bf3e2ca..a2be5526 100644
--- a/recipes-qt/qt5/ogl-runtime_git.bb
+++ b/recipes-qt/qt5/ogl-runtime_git.bb
@@ -9,17 +9,17 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
-QT_MODULE_BRANCH = "2.5"
+QT_MODULE_BRANCH = "2.6"
QT_MODULE_BRANCH_EASTL = "master"
QT_GIT_PROJECT = "qt3dstudio"
-PV = "2.5.0+git${SRCPV}"
+PV = "2.6.0+git${SRCPV}"
SRC_URI += " \
${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \
file://0001-Fix-examples-build-error.patch \
"
-SRCREV_ogl-runtime = "25236c672d81a73ee8754dbd764eb8a2a26d866e"
+SRCREV_ogl-runtime = "fe3ffda451732ebca0bdd7ecd19099f4cbfcfa75"
SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5"
SRCREV = "${SRCREV_ogl-runtime}"