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

3 files changed, 34 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 += " \
     u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
     "
 
+PREFERRED_PROVIDER_virtual/egl = "opengldummy"
+PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
+
 DISTRO_FEATURES_remove = "webengine"
diff --git a/recipes/gdb/gdb-cross-canadian_7.%.bbappend b/recipes/gdb/gdb-cross-canadian_7.%.bbappend
index b217805..34c14b7 100644
--- a/recipes/gdb/gdb-cross-canadian_7.%.bbappend
+++ b/recipes/gdb/gdb-cross-canadian_7.%.bbappend
@@ -29,6 +29,7 @@
 
 DEPENDS_${PN}_append_sdkmingw32 = " nativesdk-prebuild-python"
 RDEPENDS_${PN}_append_sdkmingw32 = " nativesdk-prebuild-python"
+EXTRA_OECONF_remove_sdkmingw32 = " --with-python=no"
 EXTRA_OECONF_append_sdkmingw32 = " --with-python"
 
 do_install_append_sdkmingw32() {
diff --git a/recipes/mesa/mesa_%.bbappend b/recipes/mesa/mesa_%.bbappend
new file mode 100644
index 0000000..fc55a18
--- /dev/null
+++ b/recipes/mesa/mesa_%.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+RDEPENDS_libgles2-mesa-dev += "libgles3-mesa-dev"