diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-05-13 16:26:33 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-05-20 11:27:36 +0300 |
commit | d5e0cf7f40587f68ef9d7f5af26b5557bb7b25e3 (patch) | |
tree | 637d7770a6c954533edd55ef521f14761cd7ce39 /conf | |
parent | cbf5a7653383beebf44c9634506661d1fa6dfcf3 (diff) | |
download | meta-boot2qt-d5e0cf7f40587f68ef9d7f5af26b5557bb7b25e3.tar.gz |
qt5: make qtwebengine a distro feature
Some devices won't have qtwebengine, so make it a DISTRO_FEATURE
that can be removed in device configs.
Change-Id: I751b1cdcc1eea48effec3980ed2da4799f88af9e
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/b2qt.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/colibri-vf.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/emulator.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/raspberrypi.conf | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 08bebd4..86aab7d 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf | |||
@@ -38,7 +38,7 @@ SANITY_TESTED_DISTROS += " \ | |||
38 | 38 | ||
39 | SYSVINIT_ENABLED_GETTYS = "" | 39 | SYSVINIT_ENABLED_GETTYS = "" |
40 | 40 | ||
41 | DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs" | 41 | DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs webengine" |
42 | POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch" | 42 | POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch" |
43 | DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" | 43 | DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" |
44 | 44 | ||
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index 715bd62..c6c818a 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf | |||
@@ -33,6 +33,8 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" | |||
33 | PREFERRED_PROVIDER_virtual/egl = "opengldummy" | 33 | PREFERRED_PROVIDER_virtual/egl = "opengldummy" |
34 | PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" | 34 | PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" |
35 | 35 | ||
36 | DISTRO_FEATURES_remove = "webengine" | ||
37 | |||
36 | MACHINE_EXTRA_INSTALL = "\ | 38 | MACHINE_EXTRA_INSTALL = "\ |
37 | opengldummy \ | 39 | opengldummy \ |
38 | " | 40 | " |
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index 3888cc5..5453742 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf | |||
@@ -31,6 +31,8 @@ MACHINE_EXTRA_RRECOMMENDS += "\ | |||
31 | 31 | ||
32 | kernel_autoload_snd-intel8x0 = "snd-intel8x0" | 32 | kernel_autoload_snd-intel8x0 = "snd-intel8x0" |
33 | 33 | ||
34 | DISTRO_FEATURES_remove = "webengine" | ||
35 | |||
34 | MACHINE_EXTRA_INSTALL = "\ | 36 | MACHINE_EXTRA_INSTALL = "\ |
35 | mount-vboxsf \ | 37 | mount-vboxsf \ |
36 | " | 38 | " |
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index 141241a..ec57b19 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf | |||
@@ -28,6 +28,8 @@ BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy" | |||
28 | 28 | ||
29 | PREFERRED_PROVIDER_virtual/libgles1 = "userland" | 29 | PREFERRED_PROVIDER_virtual/libgles1 = "userland" |
30 | 30 | ||
31 | DISTRO_FEATURES_remove = "webengine" | ||
32 | |||
31 | MACHINE_EXTRA_INSTALL = "\ | 33 | MACHINE_EXTRA_INSTALL = "\ |
32 | userland \ | 34 | userland \ |
33 | " | 35 | " |