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

* origin/krogoth:

  neptune-ui: update revision
  neptune-ui: depends on qttools-native
  Multiscreen-demo: update revision
  neptune-ui: rdepends on dbus-session
  multiscreen-demo: update revision
  qtivi: Update to the latest version
  neptune-ui: Update to the latest version
  neptune: update to latest version
  toradex: add missing USB kernel config for colibri vf

Change-Id: Ic0ae906b9acef6a09c80ee50ea7b56d558636739

5 files changed, 9 insertions, 6 deletions

diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
index 5a92f25..5830238 100644
--- a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
@@ -34,4 +34,7 @@ do_preconfigure_prepend () {
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
     echo "CONFIG_USB_ACM=m"         >> ${WORKDIR}/defconfig
     echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig
+
+    echo "CONFIG_EXTCON=y"          >> ${WORKDIR}/defconfig
+    echo "CONFIG_EXTCON_USB_GPIO=y" >> ${WORKDIR}/defconfig
 }
diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/recipes-qt/automotive/multiscreen-demo_git.bb
index 1997bd5..0c9a2bb 100644
--- a/recipes-qt/automotive/multiscreen-demo_git.bb
+++ b/recipes-qt/automotive/multiscreen-demo_git.bb
@@ -39,7 +39,7 @@ QT_MODULE_BRANCH = "master"
 
 SRC_URI += "git://github.com/qtproject/qt-apps-demo-assets;protocol=git;name=assets;destsuffix=git/demo-assets"
 
-SRCREV_multiscreen = "77ecd7d03aeea3bb7d10ac8ef448920da11ae306"
+SRCREV_multiscreen = "f4cd6b9667b4649b4ef8b4bb645850b05aceebde"
 SRCREV_assets = "0d47d21f082d6c9e355a55809ebd38a31ea02264"
 
 SRCREV_FORMAT = "multiscreen_assets"
diff --git a/recipes-qt/automotive/neptune-ui/neptune.service b/recipes-qt/automotive/neptune-ui/neptune.service
index e9f3793..7793d0b 100644
--- a/recipes-qt/automotive/neptune-ui/neptune.service
+++ b/recipes-qt/automotive/neptune-ui/neptune.service
@@ -3,7 +3,7 @@ Description=Neptune
 After=dbus.service dbus-session.service systemd-user-sessions.service
 
 [Service]
-ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml --dbus session -c am-config.yaml Main.qml
+ExecStart=/usr/bin/appcontroller /usr/bin/appman -r --dbus session -c am-config.yaml Main.qml
 Restart=on-failure
 WorkingDirectory=/opt/neptune
 
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
index ceceec8..ba82524 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -41,10 +41,10 @@ SRC_URI += " \
     file://neptune.service \
     "
 
-SRCREV = "504d9720ed7ef921af7e5f1ebf709662baac6555"
+SRCREV = "1770881783025b04ff5b4c7da7810d1648485b92"
 
-DEPENDS = "qtbase qtdeclarative"
-RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \
+DEPENDS = "qtbase qtdeclarative qttools-native"
+RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard dbus \
                   qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \
                   ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
 
diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb
index e3dd3fd..8423f99 100644
--- a/recipes-qt/automotive/qtivi_git.bb
+++ b/recipes-qt/automotive/qtivi_git.bb
@@ -44,6 +44,6 @@ PACKAGECONFIG[geniviextras-only] = "CONFIG+=geniviextras-only"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "a15c13d6255d23ce90997913b7c1347fef396fa8"
+SRCREV = "8cabf3fb534d572c905fc0a783dbb4ebc98df41c"
 
 DEPENDS = "qtbase qtdeclarative qtmultimedia"