diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-12-15 16:37:33 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-12-15 16:45:14 +0200 |
| commit | 4969969259e361f6b0b4c1087e66f91846a401ad (patch) | |
| tree | 5155010dddf3b8ca5d9e14c068e4b21f7ad19092 /conf | |
| parent | f0296da6afd374d10788d5dd1ade0fcd6e78ff7f (diff) | |
| parent | 68b683a85571d76ccaf9e61e71325aacb74e4e7e (diff) | |
| download | meta-boot2qt-4969969259e361f6b0b4c1087e66f91846a401ad.tar.gz | |
Merge remote-tracking branch 'origin/jethro' into krogoth
* origin/jethro:
colibri-imx7: use opengldummy for egl and libgles2
qt5: update submodules
gdb: correctly enable python for mingw sdk build
mesa: make sure we get libgles3-dev package in toolchain
qt5: update submodules
beaglebone: start qtlauncher only after /dev/fb0 exists
Update qtdeviceutilities module revision
Conflicts:
meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb
recipes-qt/qt5/nativesdk-qtbase_git.bbappend
recipes-qt/qt5/qtbase-native_git.bbappend
recipes-qt/qt5/qtbase_git.bbappend
recipes-qt/qt5/qtwebengine_git.bbappend
scripts/manifest.xml
Change-Id: I2f175980f16084c37c5d4032387579dab574952d
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/colibri-imx7.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf index 7a95f80..4a4d460 100644 --- a/conf/distro/include/colibri-imx7.conf +++ b/conf/distro/include/colibri-imx7.conf | |||
| @@ -35,4 +35,7 @@ BOOT_SCRIPTS += " \ | |||
| 35 | u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ | 35 | u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ |
| 36 | " | 36 | " |
| 37 | 37 | ||
| 38 | PREFERRED_PROVIDER_virtual/egl = "opengldummy" | ||
| 39 | PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" | ||
| 40 | |||
| 38 | DISTRO_FEATURES_remove = "webengine" | 41 | DISTRO_FEATURES_remove = "webengine" |