diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-06 07:48:12 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-06 09:25:02 +0300 |
| commit | 2a64102a2987fce2eb32e390584c8cf703df0905 (patch) | |
| tree | 76179081bb631861e00243a3e83a183727db071a /meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb | |
| parent | 93cabd64a8f0d10959726177e18599e581ba2251 (diff) | |
| parent | 780f0729634640d5caa103ee8634a396513fb1f6 (diff) | |
Merge remote-tracking branch 'origin/sumo' into thud
* origin/sumo:
Update automotive sha1s and remove QT_MODULE_BRANCH
ogl-runtime: enable viewer
coin: use predefined set of target configurations
ogl-runtime: skip for unsupported machines
raspberrypi: enable ALSA audio
fonts: add Thai font (Fonts-TLWG)
Move qtlauncher applications root path and style to settings file
Update sha1s for automotive 5.12.4
qtapplicationmanager: fix multi-process option
coin: update CI build instructions
neptune3-ui: Start neptune3 as the root user
Add boot2qt-launcher package config file
Implement module instructions for coin
jetson: Use default KERNEL_ROOTSPEC for jetson boards
jetson-tx2: attach bluetooth device
meta-qt5: update layer
meta-qt5: update layer
meta-qt5: update layer
meta-qt5: update layer
Change-Id: Iae6145f4209676aac03f4094dc51223582bc0fc3
Diffstat (limited to 'meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb')
| -rw-r--r-- | meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index 95086995..2bf80ad3 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb @@ -34,10 +34,11 @@ inherit packagegroup PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" +OGL_RUNTIME ?= "ogl-runtime ogl-runtime-tools" + RDEPENDS_${PN} += " \ + ${OGL_RUNTIME} \ qt3d \ - qt3d-runtime \ - qt3d-runtime-tools \ qtbase \ qtcharts \ qtconnectivity \ |