Merge remote-tracking branch 'origin/jethro' into dev

* origin/jethro:
  VKB: correctly override PACKAGECONFIG
  psplash: remove from image
  imx6: enable QT_QPA_EGLFS_FORCEVSYNC for all imx6 devices
  colibri-vf: use older 4.1 version of kernel to fix color issue
  colibri-imx7: add u-boot-nand.imx to image
  colibri-vf: add kernel image to rootfs
  dbus-session-init: fix broken init script
  Improve repo fetching
  qt5 recipes cleanup
  qt5: update submodules
  qt5: remove obsolete file 0001-Allow-a-tools-only-build.patch

Conflicts:
	meta-raspberrypi-extras/recipes/bluez5/bluez5_%.bbappend
	recipes-qt/qt5/nativesdk-qtbase_git.bbappend
	recipes-qt/qt5/qt3d_git.bbappend
	recipes-qt/qt5/qtbase-native_git.bbappend
	recipes-qt/qt5/qtbase_git.bbappend
	recipes-qt/qt5/qtcanvas3d_git.bbappend
	recipes-qt/qt5/qtcharts_git.bbappend
	recipes-qt/qt5/qtconnectivity_git.bbappend
	recipes-qt/qt5/qtdeclarative_git.bbappend
	recipes-qt/qt5/qtgraphicaleffects_git.bbappend
	recipes-qt/qt5/qtimageformats_git.bbappend
	recipes-qt/qt5/qtlocation_git.bbappend
	recipes-qt/qt5/qtmultimedia_git.bbappend
	recipes-qt/qt5/qtquickcontrols2_git.bbappend
	recipes-qt/qt5/qtquickcontrols_git.bbappend
	recipes-qt/qt5/qtsensors_git.bbappend
	recipes-qt/qt5/qtserialbus_git.bbappend
	recipes-qt/qt5/qtserialport_git.bbappend
	recipes-qt/qt5/qtsvg_git.bbappend
	recipes-qt/qt5/qttools_git.bbappend
	recipes-qt/qt5/qttranslations_git.bbappend
	recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
	recipes-qt/qt5/qtwayland_git.bbappend
	recipes-qt/qt5/qtwebchannel_git.bbappend
	recipes-qt/qt5/qtwebengine_git.bbappend
	recipes-qt/qt5/qtwebsockets_git.bbappend
	recipes-qt/qt5/qtxmlpatterns_git.bbappend
	scripts/manifest.xml

Change-Id: I089e7d3667ac4ed150cc5c2201c2505103f548ee

2 files changed, 1 insertions, 9 deletions

diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
index 7105f4b..1056ea0 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
@@ -1,4 +1,5 @@
 env=FB_MULTI_BUFFER=2
+env=QT_QPA_EGLFS_FORCEVSYNC=1
 env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/nitrogen6x/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/nitrogen6x/appcontroller.conf
deleted file mode 100644
index 1056ea0..0000000
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/nitrogen6x/appcontroller.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-env=FB_MULTI_BUFFER=2
-env=QT_QPA_EGLFS_FORCEVSYNC=1
-env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
-env=QT_IM_MODULE=qtvirtualkeyboard
-env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0
-env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src
-env=QT_QUICK_CONTROLS_STYLE=Flat
-env=XDG_RUNTIME_DIR=/tmp
-base=linux