summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/ogl-runtime_git.bb
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2020-01-13 15:42:26 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2020-01-13 15:57:32 +0200
commitf6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (patch)
treed0094937e85e890e9379d1f1de769af62fb6e656 /recipes-qt/qt5/ogl-runtime_git.bb
parent9ff0a36249205d36bb44cc34a26cb6201180a89f (diff)
parent1b8e557011fffd0446e5f660d1b317c664a7cf08 (diff)
downloadmeta-qt5-f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9.tar.gz
Merge remote-tracking branch 'qt/upstream/master' into 5.14
* qt/upstream/master: (28 commits) qtbase: Use pcre packages by default qt5: use PACKAGECONFIG to disable tests and examples qtlocation: use geoclue 2 qtbase: use offscreen platform plugin for tools qtbase: add openssl PACKAGECONFIG for native nativesdk qtbase-native: disable vulkan support maliit-framework-qt5: fix test installations qtenginio: remove obsolete module ogl-runtime: update to v2.5.0 release qtquick3d: add recipe qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance qt5: Update to Qt 5.14.0 qtbase: Fix patch fuzz detected with devtool qtbase: Backport the patch from upstream gerrit qt5-creator: Update musl patch to link qmldesigner with -lexecinfo qtwebengine: Move CharAllocator definition to header qt5-creator: Add missing dep on libz.so qt5-creator: Make clang-format patch work with multiple clang versions qtwebengine: Include cstddef for size_t definition ... Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7
Diffstat (limited to 'recipes-qt/qt5/ogl-runtime_git.bb')
-rw-r--r--recipes-qt/qt5/ogl-runtime_git.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb
index 912f5dc1..5e1f183f 100644
--- a/recipes-qt/qt5/ogl-runtime_git.bb
+++ b/recipes-qt/qt5/ogl-runtime_git.bb
@@ -14,6 +14,8 @@ QT_MODULE_BRANCH_EASTL = "master"
14QT_GIT_PROJECT = "qt3dstudio" 14QT_GIT_PROJECT = "qt3dstudio"
15PV = "2.5.0+git${SRCPV}" 15PV = "2.5.0+git${SRCPV}"
16 16
17COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc64).*-linux"
18
17SRC_URI += " \ 19SRC_URI += " \
18 ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \ 20 ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \
19 file://0001-Fix-examples-build-error.patch \ 21 file://0001-Fix-examples-build-error.patch \