aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/ogl-runtime_git.bb
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-10-25 14:30:33 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2020-01-28 12:20:48 +0200
commitf9c979f5386f1ab2601ffbfdec57604b672f05c8 (patch)
tree25e1c2597b1068b7a5e4de296326d66b344dc665 /recipes-qt/qt5/ogl-runtime_git.bb
parentea03d2b38da879122dd5412b2120cd3822a560c3 (diff)
ogl-runtime: update to v2.5.0 release
(cherry-picked from commits 09f4a09bd2cdb5631dab707c38fdcc746e339ce7 and 3e502778ee161bef4177e7e7f45c0c9b78d047da) Task-number: QT3DS-4047 Change-Id: I2b46ab69f27710fc0622076165d5d382ba8b3a6b Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/ogl-runtime_git.bb')
-rw-r--r--recipes-qt/qt5/ogl-runtime_git.bb8
1 files changed, 3 insertions, 5 deletions
diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb
index 049f885a..8bf3e2ca 100644
--- a/recipes-qt/qt5/ogl-runtime_git.bb
+++ b/recipes-qt/qt5/ogl-runtime_git.bb
@@ -9,19 +9,17 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
-QT_MODULE_BRANCH = "2.4"
+QT_MODULE_BRANCH = "2.5"
QT_MODULE_BRANCH_EASTL = "master"
QT_GIT_PROJECT = "qt3dstudio"
-PV = "2.4+git${SRCPV}"
+PV = "2.5.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 \
- file://0002-Fix-format-security-issues.patch \
- file://0003-Fix-build-on-musl-libc.patch \
"
-SRCREV_ogl-runtime = "a41270dced230d90e0e07f2ebb880e4f97317a7f"
+SRCREV_ogl-runtime = "25236c672d81a73ee8754dbd764eb8a2a26d866e"
SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5"
SRCREV = "${SRCREV_ogl-runtime}"